From 32f291fcd2ee298a29c6e46b0e2213b210f00454 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 11 Apr 2012 04:04:34 +0300 Subject: [PATCH] --- yaml --- r: 310182 b: refs/heads/master c: d7efe2281db53544400ac83160a79cf8925598d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e139e24ed746..1a26e3ad3b13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8da8ba2ea6ad52ea8558384f38586b0c1a516e9d +refs/heads/master: d7efe2281db53544400ac83160a79cf8925598d9 diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index c2b0bba9d8b3..ab56069fa31f 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/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)