diff options
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r-- | drivers/ide/icside.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 51ce404fe532..4e16ce68b063 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
@@ -287,13 +287,8 @@ static int icside_dma_end(ide_drive_t *drive) | |||
287 | ide_hwif_t *hwif = drive->hwif; | 287 | ide_hwif_t *hwif = drive->hwif; |
288 | struct expansion_card *ec = ECARD_DEV(hwif->dev); | 288 | struct expansion_card *ec = ECARD_DEV(hwif->dev); |
289 | 289 | ||
290 | drive->waiting_for_dma = 0; | ||
291 | |||
292 | disable_dma(ec->dma); | 290 | disable_dma(ec->dma); |
293 | 291 | ||
294 | /* Teardown mappings after DMA has completed. */ | ||
295 | ide_destroy_dmatable(drive); | ||
296 | |||
297 | return get_dma_residue(ec->dma) != 0; | 292 | return get_dma_residue(ec->dma) != 0; |
298 | } | 293 | } |
299 | 294 | ||
@@ -346,8 +341,6 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | |||
346 | set_dma_sg(ec->dma, hwif->sg_table, cmd->sg_nents); | 341 | set_dma_sg(ec->dma, hwif->sg_table, cmd->sg_nents); |
347 | set_dma_mode(ec->dma, dma_mode); | 342 | set_dma_mode(ec->dma, dma_mode); |
348 | 343 | ||
349 | drive->waiting_for_dma = 1; | ||
350 | |||
351 | return 0; | 344 | return 0; |
352 | } | 345 | } |
353 | 346 | ||
@@ -377,7 +370,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = { | |||
377 | .dma_start = icside_dma_start, | 370 | .dma_start = icside_dma_start, |
378 | .dma_end = icside_dma_end, | 371 | .dma_end = icside_dma_end, |
379 | .dma_test_irq = icside_dma_test_irq, | 372 | .dma_test_irq = icside_dma_test_irq, |
380 | .dma_timeout = ide_dma_timeout, | ||
381 | .dma_lost_irq = ide_dma_lost_irq, | 373 | .dma_lost_irq = ide_dma_lost_irq, |
382 | }; | 374 | }; |
383 | #else | 375 | #else |