From 16872bee331331a04751878a0042a673d351c016 Mon Sep 17 00:00:00 2001
From: Saurav Kashyap <saurav.kashyap@qlogic.com>
Date: Fri, 8 Feb 2013 01:58:02 -0500
Subject: [PATCH] --- yaml --- r: 360245 b: refs/heads/master c:
 6c3943cdb87f68a9dbb6d586f40b84622e803574 h: refs/heads/master i:   360243:
 86d2277854c6033eafb0e713647b95955a6e62a5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_isr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8e7fbed36805..b8bcabbf2eff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb4cf5b73b47fe78502b16bc3dc4af612aa37ad7
+refs/heads/master: 6c3943cdb87f68a9dbb6d586f40b84622e803574
diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c
index d62fd1a78fa8..cbf6a431fcb5 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_isr.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c
@@ -491,6 +491,8 @@ qla83xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb)
 	if (mb[1] & IDC_DEVICE_STATE_CHANGE) {
 		ql_log(ql_log_info, vha, 0x506a,
 		    "IDC Device-State changed = 0x%x.\n", mb[4]);
+		if (ha->flags.nic_core_reset_owner)
+			return;
 		qla83xx_schedule_work(vha, MBA_IDC_AEN);
 	}
 }