summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-eh.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-10-31 10:17:02 +0900
committerJeff Garzik <jeff@garzik.org>2007-11-03 08:46:54 -0400
commitcd955463bb4e96cfec18a0e5b6887c6797fb821d (patch)
treec55ee46b45751e4cf1f4fe6595784add305d91d5 /drivers/ata/libata-eh.c
parentf8d8e5799b75cf7ad530d2bf2a42229bf7360526 (diff)
downloadop-kernel-dev-cd955463bb4e96cfec18a0e5b6887c6797fb821d.zip
op-kernel-dev-cd955463bb4e96cfec18a0e5b6887c6797fb821d.tar.gz
libata: fix timing computation in ata_eh_reset()
As jiffies changes asynchronously, it needs to be cached if unchanging timestamp is needed. The code in ata_eh_reset() intended to do that with @now but never actually did it. Fix it. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r--drivers/ata/libata-eh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8d64f8f..53b2348 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2204,7 +2204,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
unsigned long now = jiffies;
if (time_before(now, deadline)) {
- unsigned long delta = deadline - jiffies;
+ unsigned long delta = deadline - now;
ata_link_printk(link, KERN_WARNING, "reset failed "
"(errno=%d), retrying in %u secs\n",
OpenPOWER on IntegriCloud