diff --git a/[refs] b/[refs]
index 18c830723831..ff613c0d7113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a077c7faf3cb3e28303ba431148a85f613f4e955
+refs/heads/master: 5cdf162654123c53f14524bb23546f4d11bfde28
diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
index 4f73daccc9f1..5e8d51bd03de 100644
--- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2625,8 +2625,10 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
 	case IBMVFC_AE_SCN_FABRIC:
 	case IBMVFC_AE_SCN_DOMAIN:
 		vhost->events_to_log |= IBMVFC_AE_RSCN;
-		vhost->delay_init = 1;
-		__ibmvfc_reset_host(vhost);
+		if (vhost->state < IBMVFC_HALTED) {
+			vhost->delay_init = 1;
+			__ibmvfc_reset_host(vhost);
+		}
 		break;
 	case IBMVFC_AE_SCN_NPORT:
 	case IBMVFC_AE_SCN_GROUP: