Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/ic/sl811hs.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/ic/sl811hs.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.31
retrieving revision 1.31.2.4
diff -u -p -r1.31 -r1.31.2.4
--- src/sys/dev/ic/sl811hs.c	2011/11/27 14:36:20	1.31
+++ src/sys/dev/ic/sl811hs.c	2012/03/12 04:11:34	1.31.2.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.31.2.4 2012/03/12 04:11:34 mrg Exp $	*/
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.31.2.4 2012/03/12 04:11:34 mrg Exp $");
 
 #include "opt_slhci.h"
 
@@ -694,6 +694,7 @@ const struct usbd_bus_methods slhci_bus_
 	slhci_freem,
 	slhci_allocx,
 	slhci_freex,
+	NULL, /* slhci_get_lock */
 };
 
 const struct usbd_pipe_methods slhci_pipe_methods = {
@@ -1470,7 +1471,6 @@ slhci_do_callback(struct slhci_softc *sc
 
 	int repeat;
 
-	sc->sc_bus.intr_context++;
 	start_cc_time(&t_callback, (u_int)xfer);
 	simple_unlock(&sc->sc_lock);
 	splx(*s);
@@ -1482,7 +1482,6 @@ slhci_do_callback(struct slhci_softc *sc
 	*s = splhardusb();
 	simple_lock(&sc->sc_lock);
 	stop_cc_time(&t_callback);
-	sc->sc_bus.intr_context--;
 
 	if (repeat && !sc->sc_bus.use_polling)
 		slhci_do_repeat(sc, xfer);
@@ -3660,8 +3659,7 @@ slhci_log_sc(void)
 
 	DDOLOG("frame=%d rootintr=%p", t->frame, t->rootintr, 0,0);
 
-	DDOLOG("use_polling=%d intr_context=%d", ssc->sc_bus.use_polling,
-	    ssc->sc_bus.intr_context, 0,0);
+	DDOLOG("use_polling=%d", ssc->sc_bus.use_polling, 0, 0, 0);
 }
 
 void