From: Wei Yongjun <[email protected]>

In case of error, the function dma_request_slave_channel() returns
NULL pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

Signed-off-by: Wei Yongjun <[email protected]>
---
 drivers/spi/spi-tegra20-slink.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 1e61e98..3643178 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -614,12 +614,9 @@ static int tegra_slink_init_dma_param(struct 
tegra_slink_data *tspi,
 
        dma_chan = dma_request_slave_channel(tspi->dev,
                                             dma_to_memory ? "rx" : "tx");
-       if (IS_ERR(dma_chan)) {
-               ret = PTR_ERR(dma_chan);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(tspi->dev,
-                               "Dma channel is not available: %d\n", ret);
-               return ret;
+       if (!dma_chan) {
+               dev_err(tspi->dev, "Dma channel is not available: %d\n", ret);
+               return -ENODEV;
        }
 
        dma_buf = dma_alloc_coherent(tspi->dev, tspi->dma_buf_size,

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

Reply via email to