diff --git a/[refs] b/[refs]
index 77e2ef7bdc77..f2430db236b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 604158ade0d5378622541232a007bf975c8bd03f
+refs/heads/master: ba8345821ac34d1630e99db7d4835db8ab20f50b
diff --git a/trunk/drivers/scsi/bfa/bfa_fcport.c b/trunk/drivers/scsi/bfa/bfa_fcport.c
index c855e225af16..f0933d8d1eda 100644
--- a/trunk/drivers/scsi/bfa/bfa_fcport.c
+++ b/trunk/drivers/scsi/bfa/bfa_fcport.c
@@ -1393,6 +1393,9 @@ bfa_fcport_enable(struct bfa_s *bfa)
 		return BFA_STATUS_PBC;
 	}
 
+	if (bfa_ioc_is_disabled(&bfa->ioc))
+		return BFA_STATUS_IOC_DISABLED;
+
 	if (fcport->diag_busy)
 		return BFA_STATUS_DIAG_BUSY;
 	else if (bfa_sm_cmp_state