diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/sata_nv.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 109b07495721..858f70610eda 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -1591,13 +1591,16 @@ static void nv_mcp55_thaw(struct ata_port *ap) | |||
1591 | static int nv_hardreset(struct ata_link *link, unsigned int *class, | 1591 | static int nv_hardreset(struct ata_link *link, unsigned int *class, |
1592 | unsigned long deadline) | 1592 | unsigned long deadline) |
1593 | { | 1593 | { |
1594 | unsigned int dummy; | 1594 | int rc; |
1595 | 1595 | ||
1596 | /* SATA hardreset fails to retrieve proper device signature on | 1596 | /* SATA hardreset fails to retrieve proper device signature on |
1597 | * some controllers. Don't classify on hardreset. For more | 1597 | * some controllers. Request follow up SRST. For more info, |
1598 | * info, see http://bugzilla.kernel.org/show_bug.cgi?id=3352 | 1598 | * see http://bugzilla.kernel.org/show_bug.cgi?id=3352 |
1599 | */ | 1599 | */ |
1600 | return sata_sff_hardreset(link, &dummy, deadline); | 1600 | rc = sata_sff_hardreset(link, class, deadline); |
1601 | if (rc) | ||
1602 | return rc; | ||
1603 | return -EAGAIN; | ||
1601 | } | 1604 | } |
1602 | 1605 | ||
1603 | static void nv_adma_error_handler(struct ata_port *ap) | 1606 | static void nv_adma_error_handler(struct ata_port *ap) |