From 3a7971781d36bb1c9c720fc2530f8fe0636cd3d8 Mon Sep 17 00:00:00 2001
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Fri, 30 Jul 2010 14:27:19 +0530
Subject: [PATCH] --- yaml --- r: 209399 b: refs/heads/master c:
 0753b4871d5b09687cee652b380a6ca15aee330e h: refs/heads/master i:   209397:
 2f0e6a12170bcbcecc939e083862bb5bcf7705fa   209395:
 cb3ffdee537b2ca28acfef93609e1b93ea7b904a   209391:
 d99e2a0a2b01eb48dcb52701121cf94d8690ae4f v: v3

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

diff --git a/[refs] b/[refs]
index 19afbcceef8d..1be93bff7e6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d4946f89fc050cadf66d08c47379ab62848a5b7
+refs/heads/master: 0753b4871d5b09687cee652b380a6ca15aee330e
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c
index fd1af23e6801..e575d765ba26 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_os.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c
@@ -1208,7 +1208,7 @@ static void qla4xxx_do_dpc(struct work_struct *work)
 
 	/* Initialization not yet finished. Don't do anything yet. */
 	if (!test_bit(AF_INIT_DONE, &ha->flags))
-		return;
+		goto do_dpc_exit;
 
 	/* HBA is in the process of being permanently disabled.
 	 * Don't process anything */
@@ -1347,6 +1347,8 @@ static void qla4xxx_do_dpc(struct work_struct *work)
 			}
 		}
 	}
+
+do_dpc_exit:
 	clear_bit(AF_DPC_SCHEDULED, &ha->flags);
 }