summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2012-04-11 04:04:34 +0300
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-05-13 22:52:10 -0500
commitd7efe2281db53544400ac83160a79cf8925598d9 (patch)
treeb477c26b2f31adfce60268c12b11403879661212 /drivers/mtd
parent8da8ba2ea6ad52ea8558384f38586b0c1a516e9d (diff)
downloadop-kernel-dev-d7efe2281db53544400ac83160a79cf8925598d9.zip
op-kernel-dev-d7efe2281db53544400ac83160a79cf8925598d9.tar.gz
mtd: omap2: fix resource leak in prefetch-busy path
If prefetch engine is busy, current code "forgets" to call dma_unmap_single(), which results in a deadlock later, so add it. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/omap2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index c2b0bba..ab56069 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -402,7 +402,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
PREFETCH_FIFOTHRESHOLD_MAX, 0x1, len, is_write);
if (ret)
/* PFPW engine is busy, use cpu copy method */
- goto out_copy;
+ goto out_copy_unmap;
init_completion(&info->comp);
@@ -421,6 +421,8 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
return 0;
+out_copy_unmap:
+ dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
out_copy:
if (info->nand.options & NAND_BUSWIDTH_16)
is_write == 0 ? omap_read_buf16(mtd, (u_char *) addr, len)
OpenPOWER on IntegriCloud