linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe
@ 2020-11-09 16:03 Zhang Qilong
  2020-12-07 22:35 ` Martin K. Petersen
  0 siblings, 1 reply; 5+ messages in thread
From: Zhang Qilong @ 2020-11-09 16:03 UTC (permalink / raw)
  To: jinpu.wang, jejb, martin.petersen; +Cc: linux-scsi

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(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index fb471ad3720a..89397e5351ff 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1131,7 +1131,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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe
  2020-11-09 16:03 [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe Zhang Qilong
@ 2020-12-07 22:35 ` Martin K. Petersen
  0 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2020-12-07 22:35 UTC (permalink / raw)
  To: Zhang Qilong; +Cc: jinpu.wang, jejb, martin.petersen, linux-scsi


Zhang,

> 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-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe
  2020-12-05 11:55 Zhang Qilong
  2020-12-07  6:31 ` Jinpu Wang
@ 2020-12-09 17:23 ` Martin K. Petersen
  1 sibling, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2020-12-09 17:23 UTC (permalink / raw)
  To: Zhang Qilong, jinpu.wang, jejb; +Cc: Martin K . Petersen, linux-scsi

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

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe
  2020-12-05 11:55 Zhang Qilong
@ 2020-12-07  6:31 ` Jinpu Wang
  2020-12-09 17:23 ` Martin K. Petersen
  1 sibling, 0 replies; 5+ messages in thread
From: Jinpu Wang @ 2020-12-07  6:31 UTC (permalink / raw)
  To: Zhang Qilong
  Cc: James E.J. Bottomley, Martin K. Petersen, Linux SCSI Mailinglist

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
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe
@ 2020-12-05 11:55 Zhang Qilong
  2020-12-07  6:31 ` Jinpu Wang
  2020-12-09 17:23 ` Martin K. Petersen
  0 siblings, 2 replies; 5+ messages in thread
From: Zhang Qilong @ 2020-12-05 11:55 UTC (permalink / raw)
  To: jinpu.wang, jejb, martin.petersen; +Cc: linux-scsi

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(-)

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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-12-09 17:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-09 16:03 [PATCH] scsi: pm80xx: Fix error return in pm8001_pci_probe Zhang Qilong
2020-12-07 22:35 ` Martin K. Petersen
2020-12-05 11:55 Zhang Qilong
2020-12-07  6:31 ` Jinpu Wang
2020-12-09 17:23 ` Martin K. Petersen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).