* [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe()
@ 2023-07-25 12:57 Yang Yingliang
2023-07-25 19:31 ` Igor Pylypiv
2023-07-26 2:03 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Yang Yingliang @ 2023-07-25 12:57 UTC (permalink / raw)
To: linux-scsi
Cc: jinpu.wang, jejb, martin.petersen, changyuanl, pranavpp,
yangyingliang
If pm8001_init_sas_add() fails, return error code in pm8001_pci_probe().
Fixes: 14a8f116cdc0 ("scsi: pm80xx: Add GET_NVMD timeout during probe")
Signed-off-by: Yang Yingliang <yangyingliang@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 2e886c1d867d..4995e1ef4e0e 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1181,7 +1181,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
pm80xx_set_thermal_config(pm8001_ha);
}
- if (pm8001_init_sas_add(pm8001_ha))
+ rc = pm8001_init_sas_add(pm8001_ha);
+ if (rc)
goto err_out_shost;
/* phy setting support for motherboard controller */
rc = pm8001_configure_phy_settings(pm8001_ha);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe()
2023-07-25 12:57 [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe() Yang Yingliang
@ 2023-07-25 19:31 ` Igor Pylypiv
2023-07-26 2:03 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Igor Pylypiv @ 2023-07-25 19:31 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-scsi, jinpu.wang, jejb, martin.petersen, changyuanl,
pranavpp
On Tue, Jul 25, 2023 at 08:57:06PM +0800, Yang Yingliang wrote:
> If pm8001_init_sas_add() fails, return error code in pm8001_pci_probe().
>
> Fixes: 14a8f116cdc0 ("scsi: pm80xx: Add GET_NVMD timeout during probe")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Igor Pylypiv <ipylypiv@google.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 2e886c1d867d..4995e1ef4e0e 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -1181,7 +1181,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
> pm80xx_set_thermal_config(pm8001_ha);
> }
>
> - if (pm8001_init_sas_add(pm8001_ha))
> + rc = pm8001_init_sas_add(pm8001_ha);
> + if (rc)
> goto err_out_shost;
> /* phy setting support for motherboard controller */
> rc = pm8001_configure_phy_settings(pm8001_ha);
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe()
2023-07-25 12:57 [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe() Yang Yingliang
2023-07-25 19:31 ` Igor Pylypiv
@ 2023-07-26 2:03 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2023-07-26 2:03 UTC (permalink / raw)
To: linux-scsi, Yang Yingliang
Cc: Martin K . Petersen, jinpu.wang, jejb, changyuanl, pranavpp
On Tue, 25 Jul 2023 20:57:06 +0800, Yang Yingliang wrote:
> If pm8001_init_sas_add() fails, return error code in pm8001_pci_probe().
>
>
Applied to 6.5/scsi-fixes, thanks!
[1/1] scsi: pm80xx: fix error return code in pm8001_pci_probe()
https://git.kernel.org/mkp/scsi/c/d4e026534577
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-26 2:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-25 12:57 [PATCH] scsi: pm80xx: fix error return code in pm8001_pci_probe() Yang Yingliang
2023-07-25 19:31 ` Igor Pylypiv
2023-07-26 2:03 ` 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