diff options
| author | Tejun Heo <tj@kernel.org> | 2010-08-27 11:09:15 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-09-09 14:19:18 -0400 |
| commit | f1f5a807b051eddd3f302e503d39214e5bde0ef2 (patch) | |
| tree | e953579992d5127dda716c84d64d8d2a733d9b33 /drivers/ata/libahci.c | |
| parent | 673424c0890a00e22398017c9adf999577526220 (diff) | |
| download | op-kernel-dev-f1f5a807b051eddd3f302e503d39214e5bde0ef2.zip op-kernel-dev-f1f5a807b051eddd3f302e503d39214e5bde0ef2.tar.gz | |
ahci: fix hang on failed softreset
ahci_do_softreset() compared the current time and deadline in reverse
when calculating timeout for SRST issue. The result is that if
@deadline is in future, SRST is issued with 0 timeout, which hasn't
caused any problem because it later waits for DRDY with the correct
timeout. If deadline is already exceeded by the time SRST is about to
be issued, the timeout calculation underflows and if the device
doesn't respond, timeout doesn't trigger for a _very_ long time.
Reverse the incorrect comparison order.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Anssi Hannula <anssi.hannula@iki.fi>
Tested-by: Gwendal Grignou <gwendal@google.com>
Cc: stable@kernel.org
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 666850d..68dc678 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1326,7 +1326,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, /* issue the first D2H Register FIS */ msecs = 0; now = jiffies; - if (time_after(now, deadline)) + if (time_after(deadline, now)) msecs = jiffies_to_msecs(deadline - now); tf.ctl |= ATA_SRST; |
