Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1045292 authored by Zhang Qilong's avatar Zhang Qilong Committed by Greg Kroah-Hartman
Browse files

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: 27909407 ("[SCSI] pm80xx: Phy settings support for motherboard controller.")
Acked-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 835126f6

drivers/scsi/pm8001/pm8001_init.c

+2 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,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);