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/ide-iops.c | |
| parent | 8ae60e34dd737ed3bef64b08130478393d9c4e8a (diff) | |
| download | linux-f37aaf9edeba3f4ae10d22aefc09c06af9ea39b6.tar.bz2 | |
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/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 76cb5f2bd4e6..e30f67e09b9c 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -799,7 +799,8 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) skip: #ifdef CONFIG_BLK_DEV_IDEDMA - if (speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) + if ((speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) && + drive->using_dma) hwif->dma_host_on(drive); else if (hwif->dma_host_on) /* check if host supports DMA */ ide_dma_off_quietly(drive); |