diff mbox

spi: tegra: checking for ERR_PTR instead of NULL

Message ID 20131216140210.GA32033@elgon.mountain (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Dan Carpenter Dec. 16, 2013, 2:02 p.m. UTC
dma_request_slave_channel() returns NULL on error and not ERR_PTRs.
I've fixed this by using dma_request_slave_channel_reason() which does
return ERR_PTRs.

Fixes: a915d150f68d ('spi: tegra: convert to standard DMA DT bindings')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Warren Dec. 16, 2013, 4:55 p.m. UTC | #1
On 12/16/2013 07:02 AM, Dan Carpenter wrote:
> dma_request_slave_channel() returns NULL on error and not ERR_PTRs.
> I've fixed this by using dma_request_slave_channel_reason() which does
> return ERR_PTRs.
> 
> Fixes: a915d150f68d ('spi: tegra: convert to standard DMA DT bindings')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Oops. I validate there aren't any more issues like this, at least in the
commits in the series this fixes.

I've applied this to Tegra's for-3.14/dmas-resets-rework branch, since
that's the only place where the commit this fixes exists.
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 1e61e9854064..be3a069879c3 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -612,8 +612,8 @@  static int tegra_slink_init_dma_param(struct tegra_slink_data *tspi,
 	int ret;
 	struct dma_slave_config dma_sconfig;
 
-	dma_chan = dma_request_slave_channel(tspi->dev,
-					     dma_to_memory ? "rx" : "tx");
+	dma_chan = dma_request_slave_channel_reason(tspi->dev,
+						dma_to_memory ? "rx" : "tx");
 	if (IS_ERR(dma_chan)) {
 		ret = PTR_ERR(dma_chan);
 		if (ret != -EPROBE_DEFER)