summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2018-03-21 21:04:12 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-21 04:02:43 +0900
commit4fb7926bba584ed7045551f8a40d0a4b0a89d2fd (patch)
tree6c1ae378d31ac078f89a3c0655d10572945a7e61 /drivers/scsi/megaraid
parentaf2cc1d2e75c50ce0dbbd3455608790c4fe07fbd (diff)
downloadlinux-stable-4fb7926bba584ed7045551f8a40d0a4b0a89d2fd.tar.gz
linux-stable-4fb7926bba584ed7045551f8a40d0a4b0a89d2fd.tar.bz2
linux-stable-4fb7926bba584ed7045551f8a40d0a4b0a89d2fd.zip
scsi: megaraid_sas: Do not log an error if FW successfully initializes.
[ Upstream commit fb1633d56b0025233ed3dc49b44544748d509d9d ] Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and IOC INIT path") Signed-off-by: Vinson Lee <vlee@freedesktop.org> Acked-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 4bf406df051b..72a919179d06 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -903,7 +903,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
goto fail_fw_init;
}
- ret = 0;
+ return 0;
fail_fw_init:
megasas_return_cmd(instance, cmd);
@@ -913,8 +913,8 @@ fail_fw_init:
IOCInitMessage, ioc_init_handle);
fail_get_cmd:
dev_err(&instance->pdev->dev,
- "Init cmd return status %s for SCSI host %d\n",
- ret ? "FAILED" : "SUCCESS", instance->host->host_no);
+ "Init cmd return status FAILED for SCSI host %d\n",
+ instance->host->host_no);
return ret;
}