[src/jmcneill-usbmp]: src/sys/dev/usb don't take the sc_lock in uhci_device_r...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d25c0c92386e
branches:  jmcneill-usbmp
changeset: 771782:d25c0c92386e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Dec 06 05:40:02 2011 +0000

description:
don't take the sc_lock in uhci_device_request() since it is already
taken (as verified by the assert at the top of this function.)

diffstat:

 sys/dev/usb/uhci.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 18ea2d6c685c -r d25c0c92386e sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Tue Dec 06 05:26:26 2011 +0000
+++ b/sys/dev/usb/uhci.c        Tue Dec 06 05:40:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.240.6.3 2011/12/06 05:26:26 mrg Exp $       */
+/*     $NetBSD: uhci.c,v 1.240.6.4 2011/12/06 05:40:02 mrg Exp $       */
 /*     $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $       */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.3 2011/12/06 05:26:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.240.6.4 2011/12/06 05:40:02 mrg Exp $");
 
 #include "opt_usb.h"
 
@@ -2524,7 +2524,6 @@
        sqh->qh.qh_elink = htole32(setup->physaddr | UHCI_PTR_TD);
        /* uhci_add_?s_ctrl() will do usb_syncmem(sqh) */
 
-       mutex_enter(&sc->sc_lock);
        if (dev->speed == USB_SPEED_LOW)
                uhci_add_ls_ctrl(sc, sqh);
        else
@@ -2562,7 +2561,6 @@
                            uhci_timeout, ii);
        }
        xfer->status = USBD_IN_PROGRESS;
-       mutex_exit(&sc->sc_lock);
 
        return (USBD_NORMAL_COMPLETION);
 }