aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/libata-eh.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 376f0044f134..45f81add150e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1616,7 +1616,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
1616 unsigned long deadline; 1616 unsigned long deadline;
1617 unsigned int action; 1617 unsigned int action;
1618 ata_reset_fn_t reset; 1618 ata_reset_fn_t reset;
1619 int i, did_followup_srst, rc; 1619 int i, rc;
1620 1620
1621 /* about to reset */ 1621 /* about to reset */
1622 ata_eh_about_to_do(ap, NULL, ehc->i.action & ATA_EH_RESET_MASK); 1622 ata_eh_about_to_do(ap, NULL, ehc->i.action & ATA_EH_RESET_MASK);
@@ -1687,11 +1687,9 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
1687 1687
1688 rc = ata_do_reset(ap, reset, classes, deadline); 1688 rc = ata_do_reset(ap, reset, classes, deadline);
1689 1689
1690 did_followup_srst = 0;
1691 if (reset == hardreset && 1690 if (reset == hardreset &&
1692 ata_eh_followup_srst_needed(rc, classify, classes)) { 1691 ata_eh_followup_srst_needed(rc, classify, classes)) {
1693 /* okay, let's do follow-up softreset */ 1692 /* okay, let's do follow-up softreset */
1694 did_followup_srst = 1;
1695 reset = softreset; 1693 reset = softreset;
1696 1694
1697 if (!reset) { 1695 if (!reset) {