diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
commit | d8f4469d5f2c35e0b8272f254b42737a2b8ce877 (patch) | |
tree | 3528896358f9d707694ab470055a19dfe68b3a09 /drivers/ide/pci/piix.c | |
parent | 2ad1e558a2305c2b3d5099ee2f4a5929307c20ca (diff) |
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/pci/piix.c')
-rw-r--r-- | drivers/ide/pci/piix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 85e8a78e10ad..caf606a1ee86 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -393,14 +393,12 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive) | |||
393 | if (ide_use_dma(drive) && piix_config_drive_for_dma(drive)) | 393 | if (ide_use_dma(drive) && piix_config_drive_for_dma(drive)) |
394 | return hwif->ide_dma_on(drive); | 394 | return hwif->ide_dma_on(drive); |
395 | 395 | ||
396 | if (ide_use_fast_pio(drive)) { | 396 | if (ide_use_fast_pio(drive)) |
397 | /* Find best PIO mode. */ | 397 | /* Find best PIO mode. */ |
398 | (void) hwif->speedproc(drive, XFER_PIO_0 + | 398 | (void) hwif->speedproc(drive, XFER_PIO_0 + |
399 | ide_get_best_pio_mode(drive, 255, 4, NULL)); | 399 | ide_get_best_pio_mode(drive, 255, 4, NULL)); |
400 | return hwif->ide_dma_off_quietly(drive); | 400 | |
401 | } | 401 | return hwif->ide_dma_off_quietly(drive); |
402 | /* IORDY not supported */ | ||
403 | return 0; | ||
404 | } | 402 | } |
405 | 403 | ||
406 | /** | 404 | /** |