---

yaml --- r: 68561 b: refs/heads/master c: 0f45894 h: refs/heads/master i: 68559: 529ab06 v: v3
git-mirror · Oct 13, 2007 · e424675 · e424675
1 parent 64f595c
commit e424675
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d7d963e3dcf8a1410000ab246921709e276cd9
+refs/heads/master: 0f458943e0247906b7a3f534f9e9e7ff3d901296
diff --git a/trunk/drivers/ide/mips/au1xxx-ide.c b/trunk/drivers/ide/mips/au1xxx-ide.c
@@ -103,7 +103,9 @@ static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
 	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_drive_t *drive, const u8 pio)
 
 	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)