1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 1eec23da28e2..2699e4e09b5b 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -598,8 +598,7 @@ megasas_alloc_cmdlist_fusion(struct megasas_instance *instance)
 	 * commands.
 	 */
 	fusion->cmd_list =
-		kcalloc(max_mpt_cmd, sizeof(struct megasas_cmd_fusion *),
-			GFP_KERNEL);
+		kzalloc_objs(struct megasas_cmd_fusion *, max_mpt_cmd);
 	if (!fusion->cmd_list) {
 		dev_err(&instance->pdev->dev,
 			"Failed from %s %d\n",  __func__, __LINE__);
@@ -607,8 +606,7 @@ megasas_alloc_cmdlist_fusion(struct megasas_instance *instance)
 	}
 
 	for (i = 0; i < max_mpt_cmd; i++) {
-		fusion->cmd_list[i] = kzalloc(sizeof(struct megasas_cmd_fusion),
-					      GFP_KERNEL);
+		fusion->cmd_list[i] = kzalloc_obj(struct megasas_cmd_fusion);
 		if (!fusion->cmd_list[i]) {
 			for (j = 0; j < i; j++)
 				kfree(fusion->cmd_list[j]);
@@ -1744,7 +1742,7 @@ static int megasas_alloc_ioc_init_frame(struct megasas_instance *instance)
 
 	fusion = instance->ctrl_context;
 
-	cmd = kzalloc(sizeof(struct megasas_cmd), GFP_KERNEL);
+	cmd = kzalloc_obj(struct megasas_cmd);
 
 	if (!cmd) {
 		dev_err(&instance->pdev->dev, "Failed from func: %s line: %d\n",
@@ -2043,7 +2041,10 @@ map_cmd_status(struct fusion_context *fusion,
 
 	case MFI_STAT_SCSI_IO_FAILED:
 	case MFI_STAT_LD_INIT_IN_PROGRESS:
-		scmd->result = (DID_ERROR << 16) | ext_status;
+		if (ext_status == 0xf0)
+			scmd->result = (DID_ERROR << 16) | SAM_STAT_CHECK_CONDITION;
+		else
+			scmd->result = (DID_ERROR << 16) | ext_status;
 		break;
 
 	case MFI_STAT_SCSI_DONE_WITH_ERROR:
@@ -4969,7 +4970,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int reason)
 	}
 
 	if (instance->requestorId && !instance->skip_heartbeat_timer_del)
-		del_timer_sync(&instance->sriov_heartbeat_timer);
+		timer_delete_sync(&instance->sriov_heartbeat_timer);
 	set_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags);
 	set_bit(MEGASAS_FUSION_OCR_NOT_POSSIBLE, &instance->reset_flags);
 	atomic_set(&instance->adprecovery, MEGASAS_ADPRESET_SM_POLLING);
@@ -5295,8 +5296,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)
 {
 	struct fusion_context *fusion;
 
-	instance->ctrl_context = kzalloc(sizeof(struct fusion_context),
-					 GFP_KERNEL);
+	instance->ctrl_context = kzalloc_obj(struct fusion_context);
 	if (!instance->ctrl_context) {
 		dev_err(&instance->pdev->dev, "Failed from %s %d\n",
 			__func__, __LINE__);