---

yaml
---
r: 148151
b: refs/heads/master
c: 7127819
h: refs/heads/master
i:
  148149: 8af3dcc
  148147: e60e861
  148143: f84dd81
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f187862e579f1f5e883188cab6bd867cb60387f
+refs/heads/master: 71278192a887d7da3e768809c6fe9979d172ff23

trunk/drivers/message/fusion/mptbase.c

@@ -2667,6 +2667,22 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
 		}
 	}
 
+	/*
+	 * Put the controller into ready state (if its not already)
+	 */
+	if (mpt_GetIocState(ioc, 1) != MPI_IOC_STATE_READY) {
+		if (!SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET,
+		    CAN_SLEEP)) {
+			if (mpt_GetIocState(ioc, 1) != MPI_IOC_STATE_READY)
+				printk(MYIOC_s_ERR_FMT "%s:  IOC msg unit "
+				    "reset failed to put ioc in ready state!\n",
+				    ioc->name, __func__);
+		} else
+			printk(MYIOC_s_ERR_FMT "%s:  IOC msg unit reset "
+			    "failed!\n", ioc->name, __func__);
+	}
+
+
 	/* Disable adapter interrupts! */
 	synchronize_irq(ioc->pcidev->irq);
 	CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);