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/cmd64x.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/cmd64x.c')
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index a76451a074c6..28f580886693 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -479,12 +479,10 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive) | |||
479 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 479 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) |
480 | return hwif->ide_dma_on(drive); | 480 | return hwif->ide_dma_on(drive); |
481 | 481 | ||
482 | if (ide_use_fast_pio(drive)) { | 482 | if (ide_use_fast_pio(drive)) |
483 | config_chipset_for_pio(drive, 1); | 483 | config_chipset_for_pio(drive, 1); |
484 | return hwif->ide_dma_off_quietly(drive); | 484 | |
485 | } | 485 | return hwif->ide_dma_off_quietly(drive); |
486 | /* IORDY not supported */ | ||
487 | return 0; | ||
488 | } | 486 | } |
489 | 487 | ||
490 | static int cmd64x_alt_dma_status (struct pci_dev *dev) | 488 | static int cmd64x_alt_dma_status (struct pci_dev *dev) |