summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pm8001
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2020-12-05 19:55:51 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:26:01 +0100
commitb7b0f1f74a46917f942b82496fbf68f47b406ead (patch)
tree792acb2f8d60cb1fdb1b768cf81ec4585b756b44 /drivers/scsi/pm8001
parent7d9b8ab3b8368e147930e81e47271cd2e41e089b (diff)
downloadlinux-stable-b7b0f1f74a46917f942b82496fbf68f47b406ead.tar.gz
linux-stable-b7b0f1f74a46917f942b82496fbf68f47b406ead.tar.bz2
linux-stable-b7b0f1f74a46917f942b82496fbf68f47b406ead.zip
scsi: pm80xx: Fix error return in pm8001_pci_probe()
[ Upstream commit 97031ccffa4f62728602bfea8439dd045cd3aeb2 ] The driver did not return an error in the case where pm8001_configure_phy_settings() failed. Use rc to store the return value of pm8001_configure_phy_settings(). Link: https://lore.kernel.org/r/20201205115551.2079471-1-zhangqilong3@huawei.com Fixes: 279094079a44 ("[SCSI] pm80xx: Phy settings support for motherboard controller.") Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/scsi/pm8001')
-rw-r--r--drivers/scsi/pm8001/pm8001_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 7a697ca68501..1d59d7447a1c 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1059,7 +1059,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
pm8001_init_sas_add(pm8001_ha);
/* phy setting support for motherboard controller */
- if (pm8001_configure_phy_settings(pm8001_ha))
+ rc = pm8001_configure_phy_settings(pm8001_ha);
+ if (rc)
goto err_out_shost;
pm8001_post_sas_ha_init(shost, chip);