[PATCH] mtd: nand: omap2: Don't call dma_release_channel() if dma_request_chan() failed

From	Roger Quadros <rogerq@ti.com>
Newsgroups	linux.kernel
Subject	[PATCH] mtd: nand: omap2: Don't call dma_release_channel() if dma_request_chan() failed
Date	2016-08-15 09:50 +0200
Message-ID	<s6kOJ-2Gt-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

dma_request_chan() can fail returning an error pointer. In this case
prevent calling dma_release_channel() to prevent a ERR_PTR() dereference.

As error path can be called even with no DMA configuration, info->dma can
be NULL so don't call dma_release_channel() for that case either.

Fixes: de3bfc4a1616: ("mtd: nand: omap2: fix return value check in omap_nand_probe()")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/mtd/nand/omap2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index a59361c..5513bfd9 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -2169,7 +2169,7 @@ scan_tail:
 	return 0;
 
 return_error:
-	if (info->dma)
+	if (!IS_ERR_OR_NULL(info->dma))
 		dma_release_channel(info->dma);
 	if (nand_chip->ecc.priv) {
 		nand_bch_free(nand_chip->ecc.priv);
-- 
2.7.4

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

Thread

[PATCH] mtd: nand: omap2: Don't call dma_release_channel() if dma_request_chan() failed Roger Quadros <rogerq@ti.com> - 2016-08-15 09:50 +0200
  Re: [PATCH] mtd: nand: omap2: Don't call dma_release_channel() if  dma_request_chan() failed Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-08-15 17:30 +0200

csiph-web