From 953039a6977ca7a570cb729a9bf7d9848bc0246d Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 31 Oct 2007 10:17:02 +0900 Subject: [PATCH] --- yaml --- r: 73057 b: refs/heads/master c: cd955463bb4e96cfec18a0e5b6887c6797fb821d h: refs/heads/master i: 73055: 02b956937243ade5b6a37e845fdff7b0386a9854 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-eh.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6b733ce39d64..3881791dd307 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8d8e5799b75cf7ad530d2bf2a42229bf7360526 +refs/heads/master: cd955463bb4e96cfec18a0e5b6887c6797fb821d diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index 8d64f8fd8f1d..53b2348a364d 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/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",