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/cs5535.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/cs5535.c')
-rw-r--r-- | drivers/ide/pci/cs5535.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index e47653f4d1dd..cd7c4190ad6e 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -206,10 +206,9 @@ static int cs5535_dma_check(ide_drive_t *drive) | |||
206 | if (ide_use_fast_pio(drive)) { | 206 | if (ide_use_fast_pio(drive)) { |
207 | speed = ide_get_best_pio_mode(drive, 255, 4, NULL); | 207 | speed = ide_get_best_pio_mode(drive, 255, 4, NULL); |
208 | cs5535_set_drive(drive, speed); | 208 | cs5535_set_drive(drive, speed); |
209 | return hwif->ide_dma_off_quietly(drive); | ||
210 | } | 209 | } |
211 | /* IORDY not supported */ | 210 | |
212 | return 0; | 211 | return hwif->ide_dma_off_quietly(drive); |
213 | } | 212 | } |
214 | 213 | ||
215 | static u8 __devinit cs5535_cable_detect(struct pci_dev *dev) | 214 | static u8 __devinit cs5535_cable_detect(struct pci_dev *dev) |