mtd: OneNAND: OMAP2/3: unmap correct DMA buffer

[net-next-2.6.git] / drivers / mtd / onenand / omap2.c

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 75f38b95811ea729b0e9f2494399253d93ed8472..f52934c7eb058d65ccc17a0ec994690472772507 100644 (file)
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -308,7 +308,7 @@ static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
                goto out_copy;
 
        /* panic_write() may be in an interrupt context */
-       if (in_interrupt())
+       if (in_interrupt() || oops_in_progress)
                goto out_copy;
 
        if (buf >= high_memory) {
@@ -385,7 +385,7 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
                goto out_copy;
 
        /* panic_write() may be in an interrupt context */
-       if (in_interrupt())
+       if (in_interrupt() || oops_in_progress)
                goto out_copy;
 
        if (buf >= high_memory) {
@@ -402,7 +402,7 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
 
        dma_src = dma_map_single(&c->pdev->dev, buf, count, DMA_TO_DEVICE);
        dma_dst = c->phys_base + bram_offset;
-       if (dma_mapping_error(&c->pdev->dev, dma_dst)) {
+       if (dma_mapping_error(&c->pdev->dev, dma_src)) {
                dev_err(&c->pdev->dev,
                        "Couldn't DMA map a %d byte buffer\n",
                        count);
@@ -425,7 +425,7 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
                if (*done)
                        break;
 
-       dma_unmap_single(&c->pdev->dev, dma_dst, count, DMA_TO_DEVICE);
+       dma_unmap_single(&c->pdev->dev, dma_src, count, DMA_TO_DEVICE);
 
        if (!*done) {
                dev_err(&c->pdev->dev, "timeout waiting for DMA\n");
@@ -520,7 +520,7 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
        dma_src = dma_map_single(&c->pdev->dev, (void *) buffer, count,
                                 DMA_TO_DEVICE);
        dma_dst = c->phys_base + bram_offset;
-       if (dma_mapping_error(&c->pdev->dev, dma_dst)) {
+       if (dma_mapping_error(&c->pdev->dev, dma_src)) {
                dev_err(&c->pdev->dev,
                        "Couldn't DMA map a %d byte buffer\n",
                        count);
@@ -538,7 +538,7 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
        omap_start_dma(c->dma_channel);
        wait_for_completion(&c->dma_done);
 
-       dma_unmap_single(&c->pdev->dev, dma_dst, count, DMA_TO_DEVICE);
+       dma_unmap_single(&c->pdev->dev, dma_src, count, DMA_TO_DEVICE);
 
        return 0;
 }