scsi: pm80xx: Fix error return code in pm8001_pci_probe()

Yang Yingliang · martinkpetersen · commit d4e026534577 · 2023-07-25T21:54:37.000-04:00
If pm8001_init_sas_add() fails, return error code in pm8001_pci_probe(). Fixes: 14a8f11 ("scsi: pm80xx: Add GET_NVMD timeout during probe") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20230725125706.566990-1-yangyingliang@huawei.com Reviewed-by: Igor Pylypiv <ipylypiv@google.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1181,7 +1181,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,`
`1181`	`1181`	`pm80xx_set_thermal_config(pm8001_ha);`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`		`- if (pm8001_init_sas_add(pm8001_ha))`
	`1184`	`+ rc = pm8001_init_sas_add(pm8001_ha);`
	`1185`	`+ if (rc)`
`1185`	`1186`	`goto err_out_shost;`
`1186`	`1187`	`/* phy setting support for motherboard controller */`
`1187`	`1188`	`rc = pm8001_configure_phy_settings(pm8001_ha);`