diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-14 14:06:45 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-07-16 02:10:46 +0200 |
| commit | de3bfc4a16165cfc5f1504981f836d39a5f39a64 (patch) | |
| tree | 4becaa2b92e9a7082029480765ea40c9b5da478d /drivers/mtd | |
| parent | Merge tag 'nand/for-4.8' of github.com:linux-nand/linux into mtd (diff) | |
| download | linux-de3bfc4a16165cfc5f1504981f836d39a5f39a64.tar.xz linux-de3bfc4a16165cfc5f1504981f836d39a5f39a64.zip | |
mtd: nand: omap2: fix return value check in omap_nand_probe()
In case of error, the function dma_request_chan() returns ERR_PTR() and
never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().
Fixes: aa7abd312c11 ('mtd: nand: omap2: Support parsing dma channel
information from DT')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 83b9091233d4..3dfd512b198b 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1920,9 +1920,9 @@ static int omap_nand_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, mask); info->dma = dma_request_chan(pdev->dev.parent, "rxtx"); - if (!info->dma) { + if (IS_ERR(info->dma)) { dev_err(&pdev->dev, "DMA engine request failed\n"); - err = -ENXIO; + err = PTR_ERR(info->dma); goto return_error; } else { struct dma_slave_config cfg; |