From 7729e716e7d7c8ca44007ce53ac17b96f32414c5 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Mon, 26 Jun 2006 00:26:15 -0700 Subject: [PATCH] --- yaml --- r: 30273 b: refs/heads/master c: 17c1033d331a430ce631805e15215e63b4cce764 h: refs/heads/master i: 30271: 9144775590c99a54ee9fdda2e4ac2c835a52d5c6 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-timing.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 95e377d72050..a95fa5882719 100644 --- 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 index 2fcfac6e967a..c0864b1e9228 100644 --- 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