diff options
Diffstat (limited to 'drivers/ide/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/au1xxx-ide.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c index ba2a211758a9..239643806b97 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) | |||
236 | if (++count >= PRD_ENTRIES) { | 236 | if (++count >= PRD_ENTRIES) { |
237 | printk(KERN_WARNING "%s: DMA table too small\n", | 237 | printk(KERN_WARNING "%s: DMA table too small\n", |
238 | drive->name); | 238 | drive->name); |
239 | goto use_pio_instead; | 239 | return 0; |
240 | } | 240 | } |
241 | 241 | ||
242 | /* Lets enable intr for the last descriptor only */ | 242 | /* 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) | |||
272 | if (count) | 272 | if (count) |
273 | return 1; | 273 | return 1; |
274 | 274 | ||
275 | use_pio_instead: | ||
276 | ide_destroy_dmatable(drive); | ||
277 | |||
278 | return 0; /* revert to PIO for this request */ | 275 | return 0; /* revert to PIO for this request */ |
279 | } | 276 | } |
280 | 277 | ||
@@ -290,10 +287,8 @@ static void auide_dma_start(ide_drive_t *drive ) | |||
290 | 287 | ||
291 | static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | 288 | static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) |
292 | { | 289 | { |
293 | if (auide_build_dmatable(drive, cmd) == 0) { | 290 | if (auide_build_dmatable(drive, cmd) == 0) |
294 | ide_map_sg(drive, cmd); | ||
295 | return 1; | 291 | return 1; |
296 | } | ||
297 | 292 | ||
298 | drive->waiting_for_dma = 1; | 293 | drive->waiting_for_dma = 1; |
299 | return 0; | 294 | return 0; |