---

yaml --- r: 185801 b: refs/heads/master c: 8e714a0 h: refs/heads/master i: 185799: 5648ed5 v: v3
git-mirror · Jan 19, 2010 · 56ca48f · 56ca48f
1 parent 2f0cfc3
commit 56ca48f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8776168ca2151850164af1de5565d01f7b8b2c53
+refs/heads/master: 8e714a074bc4da070807d019d4287dcd32af55f5
diff --git a/trunk/drivers/ide/ide-timings.c b/trunk/drivers/ide/ide-timings.c
@@ -186,11 +186,10 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
 	/*
 	 * Even in DMA/UDMA modes we still use PIO access for IDENTIFY,
 	 * S.M.A.R.T and some other commands. We have to ensure that the
-	 * DMA cycle timing is slower/equal than the fastest PIO timing.
+	 * DMA cycle timing is slower/equal than the current PIO timing.
 	 */
 	if (speed >= XFER_SW_DMA_0) {
-		u8 pio = ide_get_best_pio_mode(drive, 255, 5);
-		ide_timing_compute(drive, XFER_PIO_0 + pio, &p, T, UT);
+		ide_timing_compute(drive, drive->pio_mode, &p, T, UT);
 		ide_timing_merge(&p, t, t, IDE_TIMING_ALL);
 	}