diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:22 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:22 +0200 |
| commit | 88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch) | |
| tree | 6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/scc_pata.c | |
| parent | 11998b316173f814698f9037ce9179d634d1f423 (diff) | |
| download | kernel_samsung_smdk4412-88b4132e101e60e8fa67996ae3072ab6b71e8500.zip kernel_samsung_smdk4412-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.gz kernel_samsung_smdk4412-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.bz2 | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 2cdf51d..542419f 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) /* clear INTR & ERROR flags */ out_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6); - drive->waiting_for_dma = 1; + return 0; } @@ -354,7 +354,6 @@ static int __scc_dma_end(ide_drive_t *drive) ide_hwif_t *hwif = drive->hwif; u8 dma_stat, dma_cmd; - drive->waiting_for_dma = 0; /* get DMA command mode */ dma_cmd = scc_ide_inb(hwif->dma_base); /* stop DMA */ |