From dd4fd56410f63b533300c345835d573f66a8e346 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 25 Jun 2007 21:43:04 +0900
Subject: [PATCH] --- yaml --- r: 58061 b: refs/heads/master c:
 8b5bb2fa3d1c2a90ca921b6bfbb7e2de1e6dd273 h: refs/heads/master i:   58059:
 e536eb18cdcd351950abc48a4b2df14eb90c09fb v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ata/libata-eh.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 03532ba01292..34ede1643834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37301a559d87494614fb843b96b7528532236f82
+refs/heads/master: 8b5bb2fa3d1c2a90ca921b6bfbb7e2de1e6dd273
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index 376f0044f134..45f81add150e 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -1616,7 +1616,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
 	unsigned long deadline;
 	unsigned int action;
 	ata_reset_fn_t reset;
-	int i, did_followup_srst, rc;
+	int i, rc;
 
 	/* about to reset */
 	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,
 
 	rc = ata_do_reset(ap, reset, classes, deadline);
 
-	did_followup_srst = 0;
 	if (reset == hardreset &&
 	    ata_eh_followup_srst_needed(rc, classify, classes)) {
 		/* okay, let's do follow-up softreset */
-		did_followup_srst = 1;
 		reset = softreset;
 
 		if (!reset) {