From 4fb53350721f000ac001a97967167c8596bbd06a Mon Sep 17 00:00:00 2001
From: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
Date: Thu, 17 Dec 2009 14:51:53 -0800
Subject: [PATCH] --- yaml --- r: 178813 b: refs/heads/master c:
 a70757ba9a3719f99760713c3b72134b21016c6e h: refs/heads/master i:   178811:
 47f1eeef47f55f9e4d8f6db09b7ecaae7b83d840 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/scsi/pmcraid.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c02ac329e068..869da5d52de3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b9c212a5cbb1e13ced92639ce83f7a48b8b2331
+refs/heads/master: a70757ba9a3719f99760713c3b72134b21016c6e
diff --git a/trunk/drivers/scsi/pmcraid.c b/trunk/drivers/scsi/pmcraid.c
index e7d2688fbeba..b6f1ef954af1 100644
--- a/trunk/drivers/scsi/pmcraid.c
+++ b/trunk/drivers/scsi/pmcraid.c
@@ -2483,14 +2483,12 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
 			sense_copied = 1;
 		}
 
-		if (RES_IS_GSCSI(res->cfg_entry)) {
+		if (RES_IS_GSCSI(res->cfg_entry))
 			pmcraid_cancel_all(cmd, sense_copied);
-		} else if (sense_copied) {
+		else if (sense_copied)
 			pmcraid_erp_done(cmd);
-			return 0;
-		} else  {
+		else
 			pmcraid_request_sense(cmd);
-		}
 
 		return 1;