Commit:     cd955463bb4e96cfec18a0e5b6887c6797fb821d
Parent:     f8d8e5799b75cf7ad530d2bf2a42229bf7360526
Author:     Tejun Heo <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 31 10:17:02 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Nov 3 08:46:54 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/ata/libata-eh.c |    2 +-
 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",
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to