Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jun 2022 14:23:36 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 35da4b4f2c5e - stable/13 - Use the error given in the bcm PCI driver
Message-ID:  <202206071423.257ENaF2020457@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=35da4b4f2c5e1572067bcb85206b808ec2700cdd

commit 35da4b4f2c5e1572067bcb85206b808ec2700cdd
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-05-23 17:21:40 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-06-07 14:20:18 +0000

    Use the error given in the bcm PCI driver
    
    When given an error return it and not just ENXIO as it may contain
    information usefule to debug an error.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 5749fdc53517179d9922235c9a1b5e99c6ac3abc)
---
 sys/arm/broadcom/bcm2835/bcm2838_pci.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
index 0347a61b3c62..69c8a3e7f147 100644
--- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
@@ -536,7 +536,7 @@ bcm_pcib_msi_attach(device_t dev)
 	    INTR_MPSAFE, bcm_pcib_msi_intr, NULL, sc, &sc->msi_intr_cookie);
 	if (error != 0) {
 		device_printf(dev, "error: failed to setup MSI handler.\n");
-		return (ENXIO);
+		return (error);
 	}
 
 	bcm_name = device_get_nameunit(dev);
@@ -547,7 +547,7 @@ bcm_pcib_msi_attach(device_t dev)
 		if (error != 0) {
 			device_printf(dev,
 			"error: failed to register interrupt %d.\n", i);
-			return (ENXIO);
+			return (error);
 		}
 	}
 
@@ -557,7 +557,7 @@ bcm_pcib_msi_attach(device_t dev)
 
 	error = intr_msi_register(dev, xref);
 	if (error != 0)
-		return (ENXIO);
+		return (error);
 
 	mtx_init(&sc->msi_mtx, "bcm_pcib: msi_mtx", NULL, MTX_DEF);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206071423.257ENaF2020457>