diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index b8ec6db532b0b9354c1b74f11db53ca85b5e6353..1cfa2c9db4f23c4b616f12b1cb642350e2926ded 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3506,6 +3506,14 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,
 	       d_val.u.high != cpu_to_le32(UINT_MAX)) {
 
 		smid = le16_to_cpu(reply_desc->SMID);
+#ifdef CONFIG_SUBARCH_C3B
+		if (smid == 0xffff) {
+			smid = d_val.u.low >> 16;
+			if (smid == 0xffff)
+				break;
+		}
+#endif
+
 		cmd_fusion = fusion->cmd_list[smid - 1];
 		scsi_io_req = (struct MPI2_RAID_SCSI_IO_REQUEST *)
 						cmd_fusion->io_request;