aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/mips/au1xxx-ide.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/mips/au1xxx-ide.c')
-rw-r--r--drivers/ide/mips/au1xxx-ide.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index e8935519edbe..405903c42ba1 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -488,16 +488,16 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de
488 488
489#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) 489#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
490 490
491static int auide_dma_timeout(ide_drive_t *drive) 491static void auide_dma_timeout(ide_drive_t *drive)
492{ 492{
493// printk("%s\n", __FUNCTION__); 493 ide_hwif_t *hwif = HWIF(drive);
494 494
495 printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name); 495 printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
496 496
497 if (HWIF(drive)->ide_dma_test_irq(drive)) 497 if (hwif->ide_dma_test_irq(drive))
498 return 0; 498 return;
499 499
500 return HWIF(drive)->ide_dma_end(drive); 500 hwif->ide_dma_end(drive);
501} 501}
502 502
503 503
@@ -720,7 +720,7 @@ static int au_ide_probe(struct device *dev)
720 720
721#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 721#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
722 hwif->dma_off_quietly = &auide_dma_off_quietly; 722 hwif->dma_off_quietly = &auide_dma_off_quietly;
723 hwif->ide_dma_timeout = &auide_dma_timeout; 723 hwif->dma_timeout = &auide_dma_timeout;
724 724
725 hwif->ide_dma_check = &auide_dma_check; 725 hwif->ide_dma_check = &auide_dma_check;
726 hwif->dma_exec_cmd = &auide_dma_exec_cmd; 726 hwif->dma_exec_cmd = &auide_dma_exec_cmd;