---

yaml --- r: 30273 b: refs/heads/master c: 17c1033 h: refs/heads/master i: 30271: 9144775 v: v3
git-mirror · Jun 26, 2006 · 7729e71 · 7729e71
1 parent 72bcbef
commit 7729e71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 178184b60979992508130741f16499c360bc9c9a
+refs/heads/master: 17c1033d331a430ce631805e15215e63b4cce764
diff --git a/trunk/drivers/ide/ide-timing.h b/trunk/drivers/ide/ide-timing.h
@@ -219,6 +219,12 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing
 	if (!(s = ide_timing_find_mode(speed)))
 		return -EINVAL;
 
+/*
+ * Copy the timing from the table.
+ */
+
+	*t = *s;
+
 /*
  * If the drive is an EIDE drive, it can tell us it needs extended
  * PIO/MWDMA cycle timing.
@@ -247,7 +253,7 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing
  * Convert the timing to bus clock counts.
  */
 
-	ide_timing_quantize(s, t, T, UT);
+	ide_timing_quantize(t, t, T, UT);
 
 /*
  * Even in DMA/UDMA modes we still use PIO access for IDENTIFY, S.M.A.R.T