---

yaml --- r: 126441 b: refs/heads/master c: 5d44a15 h: refs/heads/master i: 126439: ec8eb03 v: v3
git-mirror · Jan 6, 2009 · f6f52d7 · f6f52d7
1 parent da2ff72
commit f6f52d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b78ff52354b7271b9221ca2c14c54f627c649fa
+refs/heads/master: 5d44a1502ff711bea2a9b2bf2fbd2503081cf3be
diff --git a/trunk/drivers/ide/cmd64x.c b/trunk/drivers/ide/cmd64x.c
@@ -138,10 +138,12 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 	 * the slowest address setup timing ourselves.
 	 */
 	if (hwif->channel) {
-		ide_drive_t *drives = hwif->drives;
+		ide_drive_t *pair = ide_get_pair_dev(drive);
 
 		drive->drive_data = setup_count;
-		setup_count = max(drives[0].drive_data, drives[1].drive_data);
+
+		if (pair)
+			setup_count = max_t(u8, setup_count, pair->drive_data);
 	}
 
 	if (setup_count > 5)		/* shouldn't actually happen... */