diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-08-31 03:50:15 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-08-31 03:50:15 +0000 |
| commit | 31bc96b7ab3fcde15d64b833f05789d61e01b978 (patch) | |
| tree | 350f393dcffb35f7393bc2d0ebdd61685cdc73fb | |
| parent | activate functions, when they do not add value, should return the result of config_activate_children (diff) | |
| download | wireguard-openbsd-31bc96b7ab3fcde15d64b833f05789d61e01b978.tar.xz wireguard-openbsd-31bc96b7ab3fcde15d64b833f05789d61e01b978.zip | |
uhci is apparently is unaware that it could be on a shared interrupt
It is OK to return 0 in that case, but it is not OK to print a
diagnostic.
| -rw-r--r-- | sys/dev/usb/uhci.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index ee39cf7cf25..874772f7f4a 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.77 2010/08/30 21:30:17 deraadt Exp $ */ +/* $OpenBSD: uhci.c,v 1.78 2010/08/31 03:50:15 deraadt Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -1146,13 +1146,8 @@ uhci_intr(void *arg) if (sc->sc_dying) return (0); - - if (sc->sc_bus.use_polling) { -#ifdef DIAGNOSTIC - DPRINTFN(16, ("uhci_intr: ignored interrupt while polling\n")); -#endif + if (sc->sc_bus.use_polling) return (0); - } return (uhci_intr1(sc)); } |