[PATCH net-next 03/13] sunhme: forward the error code from pci_enable_device()

Sean Anderson posted 13 patches 3 years, 6 months ago
There is a newer version of this series
[PATCH net-next 03/13] sunhme: forward the error code from pci_enable_device()
Posted by Sean Anderson 3 years, 6 months ago
From: Rolf Eike Beer <eike-kernel@sf-tec.de>

This already returns a proper error value, so pass it to the caller.

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Sean Anderson <seanga2@gmail.com>
---

 drivers/net/ethernet/sun/sunhme.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 7340d0f2ef93..1fc16801f520 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2940,11 +2940,12 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
 		strcpy(prom_name, "SUNW,hme");
 #endif
 
-	err = -ENODEV;
+	err = pci_enable_device(pdev);
 
-	if (pci_enable_device(pdev))
+	if (err)
 		goto err_out;
 	pci_set_master(pdev);
+	err = -ENODEV;
 
 	if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) {
 		qp = quattro_pci_find(pdev);
-- 
2.37.1
Re: [PATCH net-next 03/13] sunhme: forward the error code from pci_enable_device()
Posted by Jakub Kicinski 3 years, 6 months ago
On Sun, 18 Sep 2022 19:26:16 -0400 Sean Anderson wrote:
> +	err = pci_enable_device(pdev);
>  
> -	if (pci_enable_device(pdev))
> +	if (err)

No empty lines between call and retval check