[PATCH] spi: spi-ti-qspi: Fix error handling

From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH] spi: spi-ti-qspi: Fix error handling
Date	2017-02-18 11:00 +0100
Message-ID	<tc9Y6-eU-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

'dma_request_chan_by_mask()' can not return NULL.
Try to keep the logic in 'no_dma:' by resetting 'qspi->rx_chan' in case
of error.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/spi/spi-ti-qspi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index ec6fb09e2e17..0fefa6423ff4 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -714,9 +714,10 @@ static int ti_qspi_probe(struct platform_device *pdev)
 	dma_cap_set(DMA_MEMCPY, mask);
 
 	qspi->rx_chan = dma_request_chan_by_mask(&mask);
-	if (!qspi->rx_chan) {
+	if (IS_ERR(qspi->rx_chan)) {
 		dev_err(qspi->dev,
 			"No Rx DMA available, trying mmap mode\n");
+		qspi->rx_chan = NULL;
 		ret = 0;
 		goto no_dma;
 	}
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] spi: spi-ti-qspi: Fix error handling Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-02-18 11:00 +0100
  Applied "spi: spi-ti-qspi: Fix error handling" to the spi tree Mark Brown <broonie@kernel.org> - 2017-02-19 17:40 +0100
  Applied "spi: spi-ti-qspi: Fix error handling" to the spi tree Mark Brown <broonie@kernel.org> - 2017-02-19 17:40 +0100

csiph-web