summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ppc
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-17 02:40:25 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-17 02:40:25 +0100
commitd8f4469d5f2c35e0b8272f254b42737a2b8ce877 (patch)
tree3528896358f9d707694ab470055a19dfe68b3a09 /drivers/ide/ppc
parentide: convert ide_hwif_t.mmio into flag (v2) (diff)
downloadlinux-d8f4469d5f2c35e0b8272f254b42737a2b8ce877.tar.xz
linux-d8f4469d5f2c35e0b8272f254b42737a2b8ce877.zip
ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
If DMA is unsupported ->ide_dma_check should disable DMA. v2: * updated for scc_pata Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r--drivers/ide/ppc/scc_pata.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c
index f05117e8fdb9..7e3e93caafd0 100644
--- a/drivers/ide/ppc/scc_pata.c
+++ b/drivers/ide/ppc/scc_pata.c
@@ -376,11 +376,10 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
- if (ide_use_fast_pio(drive)) {
+ if (ide_use_fast_pio(drive))
hwif->tuneproc(drive, 4);
- hwif->ide_dma_off_quietly(drive);
- }
- return 1; /* DMA is not supported */
+
+ return hwif->ide_dma_off_quietly(drive);
}
/**