Skip to contentSkip to conversation

au1xxx: fix au1xxx_set_pio_mode()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Jul 26, 2007 – Jul 28, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/1 au1xxx: fix au1xxx_set_pio_mode()

Set transfer mode on the device before programming the host controller for the new timings (matches what auide_tune_chipset() is doing wrt DMA modes).

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/mips/au1xxx-ide.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ide/mips/au1xxx-ide.c +3 -4
Index: b/drivers/ide/mips/au1xxx-ide.c
===================================================================
@@ -103,7 +103,9 @@ static void au1xxx_set_pio_mode(ide_driv
 {
 	int mem_sttime;
 	int mem_stcfg;
-	u8 speed;
+
+	if (ide_config_drive_speed(drive, pio + XFER_PIO_0))
+		return;
 
 	mem_sttime = 0;
 	mem_stcfg  = au_readl(MEM_STCFG2);

@@ -164,9 +166,6 @@ static void au1xxx_set_pio_mode(ide_driv
 
 	au_writel(mem_sttime,MEM_STTIME2);
 	au_writel(mem_stcfg,MEM_STCFG2);
-
-	speed = pio + XFER_PIO_0;
-	ide_config_drive_speed(drive, speed);
 }
 
 static int auide_tune_chipset(ide_drive_t *drive, const u8 speed)