aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/cmd64x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/cmd64x.c')
-rw-r--r--drivers/ide/cmd64x.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index bf0e3f47082..80b777e4247 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -318,7 +318,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)
318 ide_hwif_t *hwif = drive->hwif; 318 ide_hwif_t *hwif = drive->hwif;
319 u8 dma_stat = 0, dma_cmd = 0; 319 u8 dma_stat = 0, dma_cmd = 0;
320 320
321 drive->waiting_for_dma = 0;
322 /* get DMA status */ 321 /* get DMA status */
323 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS); 322 dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
324 /* read DMA command state */ 323 /* read DMA command state */
@@ -327,8 +326,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)
327 outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD); 326 outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
328 /* clear the INTR & ERROR bits */ 327 /* clear the INTR & ERROR bits */
329 outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS); 328 outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
330 /* and free any DMA resources */
331 ide_destroy_dmatable(drive);
332 /* verify good DMA status */ 329 /* verify good DMA status */
333 return (dma_stat & 7) != 4; 330 return (dma_stat & 7) != 4;
334} 331}
@@ -384,7 +381,6 @@ static const struct ide_dma_ops cmd64x_dma_ops = {
384 .dma_test_irq = cmd64x_dma_test_irq, 381 .dma_test_irq = cmd64x_dma_test_irq,
385 .dma_lost_irq = ide_dma_lost_irq, 382 .dma_lost_irq = ide_dma_lost_irq,
386 .dma_timer_expiry = ide_dma_sff_timer_expiry, 383 .dma_timer_expiry = ide_dma_sff_timer_expiry,
387 .dma_timeout = ide_dma_timeout,
388 .dma_sff_read_status = ide_dma_sff_read_status, 384 .dma_sff_read_status = ide_dma_sff_read_status,
389}; 385};
390 386
@@ -396,7 +392,6 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
396 .dma_test_irq = ide_dma_test_irq, 392 .dma_test_irq = ide_dma_test_irq,
397 .dma_lost_irq = ide_dma_lost_irq, 393 .dma_lost_irq = ide_dma_lost_irq,
398 .dma_timer_expiry = ide_dma_sff_timer_expiry, 394 .dma_timer_expiry = ide_dma_sff_timer_expiry,
399 .dma_timeout = ide_dma_timeout,
400 .dma_sff_read_status = ide_dma_sff_read_status, 395 .dma_sff_read_status = ide_dma_sff_read_status,
401}; 396};
402 397
@@ -408,7 +403,6 @@ static const struct ide_dma_ops cmd648_dma_ops = {
408 .dma_test_irq = cmd648_dma_test_irq, 403 .dma_test_irq = cmd648_dma_test_irq,
409 .dma_lost_irq = ide_dma_lost_irq, 404 .dma_lost_irq = ide_dma_lost_irq,
410 .dma_timer_expiry = ide_dma_sff_timer_expiry, 405 .dma_timer_expiry = ide_dma_sff_timer_expiry,
411 .dma_timeout = ide_dma_timeout,
412 .dma_sff_read_status = ide_dma_sff_read_status, 406 .dma_sff_read_status = ide_dma_sff_read_status,
413}; 407};
414 408