diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
| commit | fe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch) | |
| tree | c5a7fd72a745a5f6656a58acc9a1d277e26f9595 /drivers/ata/libata-eh.c | |
| parent | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (diff) | |
| parent | 0644f5393e915f13733bcc65f13195ff39aeb63e (diff) | |
| download | linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.gz linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.bz2 linux-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.zip | |
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'drivers/ata/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 7d4535e989bf..100428dde421 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2623,6 +2623,8 @@ int ata_eh_reset(struct ata_link *link, int classify, */ while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX) max_tries++; + if (link->flags & ATA_LFLAG_RST_ONCE) + max_tries = 1; if (link->flags & ATA_LFLAG_NO_HRST) hardreset = NULL; if (link->flags & ATA_LFLAG_NO_SRST) |