aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/atiixp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/atiixp.c')
-rw-r--r--drivers/ide/pci/atiixp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 6d372c4e1d81..e7b4415adc83 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -252,21 +252,20 @@ static int atiixp_config_drive_for_dma(ide_drive_t *drive)
252 252
253static int atiixp_dma_check(ide_drive_t *drive) 253static int atiixp_dma_check(ide_drive_t *drive)
254{ 254{
255 ide_hwif_t *hwif = HWIF(drive);
256 u8 tspeed, speed; 255 u8 tspeed, speed;
257 256
258 drive->init_speed = 0; 257 drive->init_speed = 0;
259 258
260 if (ide_use_dma(drive) && atiixp_config_drive_for_dma(drive)) 259 if (ide_use_dma(drive) && atiixp_config_drive_for_dma(drive))
261 return hwif->ide_dma_on(drive); 260 return 0;
262 261
263 if (ide_use_fast_pio(drive)) { 262 if (ide_use_fast_pio(drive)) {
264 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL); 263 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
265 speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0; 264 speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
266 hwif->speedproc(drive, speed); 265 atiixp_speedproc(drive, speed);
267 } 266 }
268 267
269 return hwif->ide_dma_off_quietly(drive); 268 return -1;
270} 269}
271 270
272/** 271/**