| Message ID | 20201205115551.2079471-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: pm80xx: Fix error return in pm8001_pci_probe | expand |
On Sat, Dec 5, 2020 at 12:53 PM Zhang Qilong <zhangqilong3@huawei.com> wrote: > > Forget to set error code when pm8001_configure_phy_settings > failed. We fixed it by using rc to store return value of > pm8001_configure_phy_settings. > > Fixes: 279094079a442 ("[SCSI] pm80xx: Phy settings support for motherboard controller.") > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> Thx > --- > drivers/scsi/pm8001/pm8001_init.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c > index 9a5d284f076a..ee2de177d0d0 100644 > --- a/drivers/scsi/pm8001/pm8001_init.c > +++ b/drivers/scsi/pm8001/pm8001_init.c > @@ -1127,7 +1127,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); > -- > 2.25.4 >
On Sat, 5 Dec 2020 19:55:51 +0800, Zhang Qilong wrote: > Forget to set error code when pm8001_configure_phy_settings > failed. We fixed it by using rc to store return value of > pm8001_configure_phy_settings. Applied to 5.11/scsi-queue, thanks! [1/1] scsi: pm80xx: Fix error return in pm8001_pci_probe https://git.kernel.org/mkp/scsi/c/97031ccffa4f
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 9a5d284f076a..ee2de177d0d0 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -1127,7 +1127,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);
Forget to set error code when pm8001_configure_phy_settings failed. We fixed it by using rc to store return value of pm8001_configure_phy_settings. Fixes: 279094079a442 ("[SCSI] pm80xx: Phy settings support for motherboard controller.") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> --- drivers/scsi/pm8001/pm8001_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)