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/sis5513.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/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 4fff663a6432..53ffeced06ff 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -678,12 +678,10 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive) | |||
678 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 678 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) |
679 | return hwif->ide_dma_on(drive); | 679 | return hwif->ide_dma_on(drive); |
680 | 680 | ||
681 | if (ide_use_fast_pio(drive)) { | 681 | if (ide_use_fast_pio(drive)) |
682 | sis5513_tune_drive(drive, 5); | 682 | sis5513_tune_drive(drive, 5); |
683 | return hwif->ide_dma_off_quietly(drive); | 683 | |
684 | } | 684 | return hwif->ide_dma_off_quietly(drive); |
685 | /* IORDY not supported */ | ||
686 | return 0; | ||
687 | } | 685 | } |
688 | 686 | ||
689 | /* Chip detection and general config */ | 687 | /* Chip detection and general config */ |