Skip to content

Commit

Permalink
mtd: nand: omap2: fix return value check in omap_nand_probe()
Browse files Browse the repository at this point in the history
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: aa7abd3 ('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>
  • Loading branch information
Wei Yongjun authored and Brian Norris committed Jul 16, 2016
1 parent 1ed1069 commit de3bfc4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/nand/omap2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit de3bfc4

Please sign in to comment.