aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/sgiioc4.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:26 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:26 -0500
commit3608b5d71a52c053787dbad6af20c25f7e0b75a9 (patch)
tree5bd6ac777d32d8426e65e3c31cc1587674771e8c /drivers/ide/pci/sgiioc4.c
parent9ef5791e1be91007951477b8ed1530ac1166a8e7 (diff)
ide: add ide_set_dma() helper (v2)
* add ide_set_dma() helper and make ide_hwif_t.ide_dma_check return -1 when DMA needs to be disabled (== need to call ->ide_dma_off_quietly) 0 when DMA needs to be enabled (== need to call ->ide_dma_on) 1 when DMA setting shouldn't be changed * fix IDE code to use ide_set_dma() instead if using ->ide_dma_check directly v2: * updated for scc_pata Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r--drivers/ide/pci/sgiioc4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 290697e09e55..cb5c3211bd8e 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -296,9 +296,9 @@ static int sgiioc4_ide_dma_check(ide_drive_t *drive)
296 if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) { 296 if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
297 printk(KERN_WARNING "%s: couldn't set MWDMA2 mode, " 297 printk(KERN_WARNING "%s: couldn't set MWDMA2 mode, "
298 "using PIO instead\n", drive->name); 298 "using PIO instead\n", drive->name);
299 return sgiioc4_ide_dma_off_quietly(drive); 299 return -1;
300 } else 300 } else
301 return sgiioc4_ide_dma_on(drive); 301 return 0;
302} 302}
303 303
304/* returns 1 if dma irq issued, 0 otherwise */ 304/* returns 1 if dma irq issued, 0 otherwise */