aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/scc_pata.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:22 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:22 -0400
commit88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch)
tree6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/scc_pata.c
parent11998b316173f814698f9037ce9179d634d1f423 (diff)
ide: set/clear drive->waiting_for_dma flag in the core code
Set/clear drive->waiting_for_dma flag in the core code instead of in ->dma_setup and ->dma_end methods. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/scc_pata.c')
-rw-r--r--drivers/ide/scc_pata.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 2cdf51d8917a..542419ffa9b7 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -335,7 +335,7 @@ static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
335 335
336 /* clear INTR & ERROR flags */ 336 /* clear INTR & ERROR flags */
337 out_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6); 337 out_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6);
338 drive->waiting_for_dma = 1; 338
339 return 0; 339 return 0;
340} 340}
341 341
@@ -354,7 +354,6 @@ static int __scc_dma_end(ide_drive_t *drive)
354 ide_hwif_t *hwif = drive->hwif; 354 ide_hwif_t *hwif = drive->hwif;
355 u8 dma_stat, dma_cmd; 355 u8 dma_stat, dma_cmd;
356 356
357 drive->waiting_for_dma = 0;
358 /* get DMA command mode */ 357 /* get DMA command mode */
359 dma_cmd = scc_ide_inb(hwif->dma_base); 358 dma_cmd = scc_ide_inb(hwif->dma_base);
360 /* stop DMA */ 359 /* stop DMA */