diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2002-04-09 12:55:46 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2002-04-09 12:55:46 +0000 |
| commit | 242fcd8d180b156f838ee110d923c1a14bb68ede (patch) | |
| tree | 92bbf0ab4b43be7ab8b83115446b12cb5ea02ec3 /sys/dev/usb/usb.c | |
| parent | c3e3cbe16e782ac8b1a9c9731cfc34330cce8e61 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/usb.c')
| -rw-r--r-- | sys/dev/usb/usb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 94bc3a22fe78..b748b38d5914 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -246,7 +246,7 @@ USB_ATTACH(usb) #ifdef USB_USE_SOFTINTR #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS /* XXX we should have our own level */ - sc->sc_bus->soft = softintr_establish(IPL_SOFTNET, + sc->sc_bus->soft = softintr_establish(IPL_SOFTNET, sc->sc_bus->methods->soft_intr, sc->sc_bus); if (sc->sc_bus->soft == NULL) { printf("%s: can't register softintr\n", USBDEVNAME(sc->sc_dev)); @@ -383,8 +383,8 @@ usb_event_thread(void *arg) /* * In case this controller is a companion controller to an - * EHCI controller we need to wait until the - * EHCI controller has grabbed the port. + * EHCI controller we need to wait until the EHCI controller + * has grabbed the port. * XXX It would be nicer to do this with a tsleep(), but I don't * know how to synchronize the creation of the threads so it * will work. @@ -473,14 +473,14 @@ usbopen(dev_t dev, int flag, int mode, usb_proc_ptr p) usb_dev_open = 1; usb_async_proc = 0; return (0); - } else { - USB_GET_SC_OPEN(usb, unit, sc); + } - if (sc->sc_dying) - return (EIO); + USB_GET_SC_OPEN(usb, unit, sc); - return (0); - } + if (sc->sc_dying) + return (EIO); + + return (0); } int |