1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index fd406348fdfd..9f322f1a7f22 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -309,7 +309,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) {
@@ -386,7 +386,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) {
@@ -403,7 +403,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);
@@ -426,7 +426,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");
@@ -521,7 +521,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);
@@ -539,7 +539,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;
 }