Module Name: src
Committed By: skrll
Date: Tue Jun 24 05:07:31 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
src/sys/arch/arm/broadcom: bcm53xx_usb.c
Log Message:
If [eo]hci_init fail then bail out and don't try and attach devices.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/allwinner/awin_usb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm53xx_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.11 src/sys/arch/arm/allwinner/awin_usb.c:1.12
--- src/sys/arch/arm/allwinner/awin_usb.c:1.11 Mon Jun 23 07:29:42 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Tue Jun 24 05:07:31 2014
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.11 2014/06/23 07:29:42 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12 2014/06/24 05:07:31 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -213,10 +213,10 @@ ehci_awinusb_attach(device_t parent, dev
int error = ehci_init(sc);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", error);
- } else {
- /* Attach usb device. */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+ return;
}
+ /* Attach usb device. */
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
const int irq = awinusb_ehci_irqs[usbaa->usbaa_port];
usbsc->usbsc_ehci_ih = intr_establish(irq, IPL_USB,
Index: src/sys/arch/arm/broadcom/bcm53xx_usb.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.5 src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.6
--- src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.5 Wed Feb 19 22:21:16 2014
+++ src/sys/arch/arm/broadcom/bcm53xx_usb.c Tue Jun 24 05:07:31 2014
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.5 2014/02/19 22:21:16 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.6 2014/06/24 05:07:31 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -125,10 +125,11 @@ ohci_bcmusb_attach(device_t parent, devi
int error = ohci_init(sc);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", error);
- } else {
- /* Attach usb device. */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+ return;
}
+
+ /* Attach usb device. */
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
}
#ifdef EHCI_DEBUG
@@ -184,10 +185,10 @@ ehci_bcmusb_attach(device_t parent, devi
int error = ehci_init(sc);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", error);
- } else {
- /* Attach usb device. */
- sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+ return;
}
+ /* Attach usb device. */
+ sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
}
/*
