Module Name: src
Committed By: mrg
Date: Tue Dec 6 05:05:30 UTC 2011
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: ohci.c
Log Message:
don't forget to drop the lock in ohci_intr if we got there when
polling. also don't try to drop a lock we don't have in ohci_open.
XXX: these might apply to ehci as well, i found them when porting
XXX: to uhci.
To generate a diff of this commit:
cvs rdiff -u -r1.218.6.3 -r1.218.6.4 src/sys/dev/usb/ohci.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/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.218.6.3 src/sys/dev/usb/ohci.c:1.218.6.4
--- src/sys/dev/usb/ohci.c:1.218.6.3 Tue Dec 6 02:10:01 2011
+++ src/sys/dev/usb/ohci.c Tue Dec 6 05:05:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.218.6.3 2011/12/06 02:10:01 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.218.6.4 2011/12/06 05:05:30 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.3 2011/12/06 02:10:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.6.4 2011/12/06 05:05:30 mrg Exp $");
#include "opt_usb.h"
@@ -1147,7 +1147,7 @@ ohci_intr(void *p)
OWRITE4(sc, OHCI_INTERRUPT_STATUS,
OREAD4(sc, OHCI_INTERRUPT_STATUS));
- return (0);
+ goto done;
}
ret = ohci_intr1(sc);
@@ -2225,7 +2225,6 @@ ohci_open(usbd_pipe_handle pipe)
if (sed != NULL)
ohci_free_sed(sc, sed);
bad0:
- mutex_exit(&sc->sc_lock);
return err;
}
