From 1e4a5a5eaf5a971c5b3006e0b1590fa4941bbc86 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Wed, 16 Nov 2005 17:06:18 +0800 Subject: [PATCH] --- yaml --- r: 14293 b: refs/heads/master c: 75b1f2f865c6e6c6c04e2779750192b8d3d504e8 h: refs/heads/master i: 14291: 1f7f258739c84bf8532e2da80678e0144244cb97 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18053d82fa7c..bcca89c7da08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d10cb35a876c72b4b6711a366e341a1e4d8aa709 +refs/heads/master: 75b1f2f865c6e6c6c04e2779750192b8d3d504e8 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index ba1eb8b38e00..bb604dfbdef6 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1570,11 +1570,13 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, /* * Find the mode. - */ + */ if (!(s = ata_timing_find_mode(speed))) return -EINVAL; + memcpy(t, s, sizeof(*s)); + /* * If the drive is an EIDE drive, it can tell us it needs extended * PIO/MW_DMA cycle timing. @@ -1595,7 +1597,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, * Convert the timing to bus clock counts. */ - ata_timing_quantize(s, t, T, UT); + ata_timing_quantize(t, t, T, UT); /* * Even in DMA/UDMA modes we still use PIO access for IDENTIFY, S.M.A.R.T