8 files changed, 17 insertions, 37 deletions

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index ba2a211758a..239643806b9 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -236,7 +236,7 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                         if (++count >= PRD_ENTRIES) {
                                 printk(KERN_WARNING "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         }
 
                         /* Lets enable intr for the last descriptor only */
@@ -272,9 +272,6 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
         if (count)
                 return 1;
 
- use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 
@@ -290,10 +287,8 @@ static void auide_dma_start(ide_drive_t *drive )
 
 static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        if (auide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (auide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         drive->waiting_for_dma = 1;
         return 0;
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c
index f8adbb5eb33..e10054b827a 100644
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -166,8 +166,6 @@ use_pio_instead:
         printk(KERN_ERR "%s: %s\n", drive->name,
                 count ? "DMA table too small" : "empty DMA table?");
 
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 EXPORT_SYMBOL_GPL(ide_build_dmatable);
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index c0505e2dfc2..d61f9a8cc18 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -570,8 +570,12 @@ int ide_dma_prepare(ide_drive_t *drive, struct ide_cmd *cmd)
 
         if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
             (dma_ops->dma_check && dma_ops->dma_check(drive, cmd)) ||
-            ide_build_sglist(drive, cmd) == 0 ||
-            dma_ops->dma_setup(drive, cmd))
+            ide_build_sglist(drive, cmd) == 0)
                 return 1;
+        if (dma_ops->dma_setup(drive, cmd)) {
+                ide_destroy_dmatable(drive);
+                ide_map_sg(drive, cmd);
+                return 1;
+        }
         return 0;
 }
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 5643a8b957b..1df7b763645 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1455,7 +1455,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                                        "switching to PIO on Ohare chipset\n", drive->name);
                                 pmif->broken_dma_warn = 1;
                         }
-                        goto use_pio_instead;
+                        return 0;
                 }
                 while (cur_len) {
                         unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00;
@@ -1463,7 +1463,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                         if (count++ >= MAX_DCMDS) {
                                 printk(KERN_WARNING "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         }
                         st_le16(&table->command, wr? OUTPUT_MORE: INPUT_MORE);
                         st_le16(&table->req_count, tc);
@@ -1492,9 +1492,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
 
         printk(KERN_DEBUG "%s: empty DMA table?\n", drive->name);
 
-use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 
@@ -1510,10 +1507,8 @@ static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4);
         u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
 
-        if (pmac_ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (pmac_ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* Apple adds 60ns to wrDataSetup on reads */
         if (ata4 && (pmif->timings[unit] & TR_66_UDMA_EN)) {
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 693536ebe33..2cdf51d8917 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -321,10 +321,8 @@ static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 dma_stat;
 
         /* fall back to pio! */
-        if (ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* PRD table */
         out_be32((void __iomem *)(hwif->dma_base + 8), hwif->dmatable_dma);
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index 457a762a1f2..d90e8c5af0a 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -442,7 +442,7 @@ static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                                 printk(KERN_WARNING
                                        "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         } else {
                                 u32 bcount =
                                     0x10000 - (cur_addr & 0xffff);
@@ -477,9 +477,6 @@ static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                 return count;
         }
 
-use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0;               /* revert to PIO for this request */
 }
 
@@ -488,11 +485,9 @@ static int sgiioc4_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         int ddir;
         u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
 
-        if (sgiioc4_build_dmatable(drive, cmd) == 0) {
+        if (sgiioc4_build_dmatable(drive, cmd) == 0)
                 /* try PIO instead of DMA */
-                ide_map_sg(drive, cmd);
                 return 1;
-        }
 
         if (write)
                 /* Writes TO the IOC4 FROM Main Memory */
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index 1076efd050d..0be27cae27d 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -193,11 +193,10 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         unsigned int count, rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 1 : 2;
 
         count = ide_build_dmatable(drive, cmd);
-        if (count == 0) {
-                ide_map_sg(drive, cmd);
+        if (count == 0)
                 /* try PIO instead of DMA */
                 return 1;
-        }
+
         outl(hwif->dmatable_dma | rw, hwif->dma_base);
         drive->waiting_for_dma = 1;
         /* start DMA */
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index f62ced855cf..7267c46c07c 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -279,8 +279,6 @@ use_pio_instead:
         printk(KERN_ERR "%s: %s\n", drive->name,
                 count ? "DMA table too small" : "empty DMA table?");
 
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 #else
@@ -294,10 +292,8 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 0 : ATA_DMA_WR;
 
         /* fall back to PIO! */
-        if (tx4939ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (tx4939ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* PRD table */
         tx4939ide_writel(hwif->dmatable_dma, base, TX4939IDE_PRD_Ptr);