diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:02 +0100 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:02 +0100 |
commit | f37aaf9edeba3f4ae10d22aefc09c06af9ea39b6 (patch) | |
tree | 167b73d875f3f5c36e9c4378d6e499cf08a46205 /drivers/ide/pci | |
parent | 8ae60e34dd737ed3bef64b08130478393d9c4e8a (diff) |
ide: move drive->using_dma check to callers of ->dma_host_on method
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/cs5520.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/sc1200.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 78058ca2ce76..2bd52af83d37 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c @@ -109,8 +109,7 @@ static void cs5520_set_dma_mode(ide_drive_t *drive, const u8 speed) static void cs5520_dma_host_on(ide_drive_t *drive) { - if (drive->using_dma) - drive->vdma = 1; + drive->vdma = 1; ide_dma_host_on(drive); } diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 8a94c3e8f7c4..9303dfee7780 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c @@ -221,7 +221,7 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio) if (mode != -1) { printk("SC1200: %s: changing (U)DMA mode\n", drive->name); ide_dma_off_quietly(drive); - if (ide_set_dma_mode(drive, mode) == 0) + if (ide_set_dma_mode(drive, mode) == 0 && drive->using_dma) hwif->dma_host_on(drive); return; } |