From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Fri, 11 Apr 2014 20:54:12 +0000 (-0400)
Subject: qla2xxx: Issue abort command for outstanding commands during cleanup when only firmwa... 
X-Git-Tag: next-20140521~17^2~73
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af13b700de669e80c215236769649a7393a5e356;p=karo-tx-linux.git

qla2xxx: Issue abort command for outstanding commands during cleanup when only firmware is alive.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 5511e24b1f11..81388e957237 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3682,8 +3682,10 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
 			for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++) {
 				sp = req->outstanding_cmds[cnt];
 				if (sp) {
-					if (!sp->u.scmd.ctx ||
-					    (sp->flags & SRB_FCP_CMND_DMA_VALID)) {
+					if ((!sp->u.scmd.ctx ||
+					    (sp->flags &
+						SRB_FCP_CMND_DMA_VALID)) &&
+						!ha->flags.isp82xx_fw_hung) {
 						spin_unlock_irqrestore(
 						    &ha->hardware_lock, flags);
 						if (ha->isp_ops->abort_command(sp)) {