Module Name: src
Committed By: skrll
Date: Mon Jun 23 07:29:42 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
Log Message:
Return if ohci_init fails.
Please evaluate your changes and consider the following. CVS: Abort checkin if
you answer no. CVS: => For all changes: CVS: Do the changed files compile? CVS:
Has the change been tested? CVS: => If you
are not completely familiar with the changed components: CVS: Has the change
been posted for review? CVS: Have you allowed enough time for feedback? CVS:
=> If the change is major: CVS: => If the
change adds files to, or removes files from $DESTDIR: CVS: => If you are
changing a library or kernel interface: CVS: Have you successfully run
"./build.sh release"? CVS:
---------------------------------------------------------------------- CVS:
Enter Log. Lines beginning with `CVS:' are removed automatically CVS: CVS:
Committing in . CVS: CVS: Modified Files: CVS:
sys/arch/arm/allwinner/awin_usb.c CVS:
----------------------------------------------------------------------
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/allwinner/awin_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.10 src/sys/arch/arm/allwinner/awin_usb.c:1.11
--- src/sys/arch/arm/allwinner/awin_usb.c:1.10 Thu Feb 20 21:48:38 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Mon Jun 23 07:29:42 2014
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.10 2014/02/20 21:48:38 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.11 2014/06/23 07:29:42 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -139,11 +139,12 @@ ohci_awinusb_attach(device_t parent, dev
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);
+
const int irq = awinusb_ohci_irqs[usbaa->usbaa_port];
usbsc->usbsc_ohci_ih = intr_establish(irq, IPL_USB,
IST_LEVEL, ohci_intr, sc);
