~hc/RK356X_SDK_RELEASE.git

..	..	@@ -784,6 +784,7 @@
784	784	/*
785	785	* Allow non-SAS & non-NEXUS_LOSS to drop into below code
786	786	*/
	787	+ fallthrough;
787	788
788	789	case MPI_IOCSTATUS_SCSI_TASK_TERMINATED: /* 0x0048 */
789	790	/* Linux handles an unsolicited DID_RESET better
..	..	@@ -880,6 +881,7 @@
880	881
881	882	case MPI_IOCSTATUS_SCSI_DATA_OVERRUN: /* 0x0044 */
882	883	scsi_set_resid(sc, 0);
	884	+ fallthrough;
883	885	case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR: /* 0x0040 */
884	886	case MPI_IOCSTATUS_SUCCESS: /* 0x0000 */
885	887	sc->result = (DID_OK << 16) \| scsi_status;
..	..	@@ -1517,7 +1519,6 @@
1517	1519	int ii;
1518	1520	int retval;
1519	1521	MPT_ADAPTER *ioc = hd->ioc;
1520		- unsigned long timeleft;
1521	1522	u8 issue_hard_reset;
1522	1523	u32 ioc_raw_state;
1523	1524	unsigned long time_count;
..	..	@@ -1615,7 +1616,7 @@
1615	1616	}
1616	1617	}
1617	1618
1618		- timeleft = wait_for_completion_timeout(&ioc->taskmgmt_cmds.done,
	1619	+ wait_for_completion_timeout(&ioc->taskmgmt_cmds.done,
1619	1620	timeout*HZ);
1620	1621	if (!(ioc->taskmgmt_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
1621	1622	retval = FAILED;
..	..	@@ -1935,7 +1936,7 @@
1935	1936	/* If our attempts to reset the host failed, then return a failed
1936	1937	* status. The host will be taken off line by the SCSI mid-layer.
1937	1938	*/
1938		- retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
	1939	+ retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
1939	1940	if (retval < 0)
1940	1941	status = FAILED;
1941	1942	else