From 977c0b9e77945b91dc6a96bb7018af53fe93283c Mon Sep 17 00:00:00 2001
From: Lalit Chandivade <lalit.chandivade@qlogic.com>
Date: Fri, 3 Sep 2010 14:57:04 -0700
Subject: [PATCH] --- yaml --- r: 210608 b: refs/heads/master c:
 0374f55ed882a46cd4825dde16ca2392d4c367f6 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_isr.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c985c8c618bf..7900c2021e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4142b1987f1f8ba90589642cb74566eaff3dc2e9
+refs/heads/master: 0374f55ed882a46cd4825dde16ca2392d4c367f6
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index 6982ba70e12a..28f65be19dad 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -1706,19 +1706,20 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 				cp->result = DID_ERROR << 16;
 				break;
 			}
-		} else if (!lscsi_status) {
+		} else {
 			DEBUG2(qla_printk(KERN_INFO, ha,
 			    "scsi(%ld:%d:%d) Dropped frame(s) detected (0x%x "
 			    "of 0x%x bytes).\n", vha->host_no, cp->device->id,
 			    cp->device->lun, resid, scsi_bufflen(cp)));
 
-			cp->result = DID_ERROR << 16;
-			break;
+			cp->result = DID_ERROR << 16 | lscsi_status;
+			goto check_scsi_status;
 		}
 
 		cp->result = DID_OK << 16 | lscsi_status;
 		logit = 0;
 
+check_scsi_status:
 		/*
 		 * Check to see if SCSI Status is non zero. If so report SCSI
 		 * Status.