diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-08 05:16:37 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2009-07-15 04:41:28 +0200 |
| commit | fe2c4d018fc6127610fef677e020b3bb41cfaaaf (patch) | |
| tree | ce6bfcc0a34066c246667a31bf9f1d5f9538f651 | |
| parent | Linux 2.6.31-rc3 (diff) | |
| download | linux-fe2c4d018fc6127610fef677e020b3bb41cfaaaf.tar.xz linux-fe2c4d018fc6127610fef677e020b3bb41cfaaaf.zip | |
libata: fix follow-up SRST failure path
ata_eh_reset() was missing error return handling after follow-up SRST
allowing EH to continue the normal probing path after reset failure.
This was discovered while testing new WD 2TB drives which take longer
than 10 secs to spin up and cause the first follow-up SRST to time
out.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/ata/libata-eh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index fa22f94ca415..1a07c061f644 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2517,6 +2517,10 @@ int ata_eh_reset(struct ata_link *link, int classify, ata_eh_about_to_do(link, NULL, ATA_EH_RESET); rc = ata_do_reset(link, reset, classes, deadline, true); + if (rc) { + failed_link = link; + goto fail; + } } } else { if (verbose) |