Module Name: src
Committed By: mrg
Date: Fri Mar 20 03:04:48 UTC 2015
Modified Files:
src/sys/dev/usb: uhid.c
Log Message:
don't take the device lock when stopping the uhidev. that calls
to abort and close pipes, both of which may take an adaptive lock.
fixes a LOCKDEBUG abort see on one particular machine.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/uhid.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/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.93 src/sys/dev/usb/uhid.c:1.94
--- src/sys/dev/usb/uhid.c:1.93 Sat Mar 7 20:20:55 2015
+++ src/sys/dev/usb/uhid.c Fri Mar 20 03:04:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.93 2015/03/07 20:20:55 mrg Exp $ */
+/* $NetBSD: uhid.c,v 1.94 2015/03/20 03:04:48 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.93 2015/03/07 20:20:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.94 2015/03/20 03:04:48 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -364,9 +364,7 @@ uhidclose(dev_t dev, int flag, int mode,
mutex_enter(&sc->sc_access_lock);
- mutex_enter(&sc->sc_lock);
uhidev_stop(&sc->sc_hdev);
- mutex_exit(&sc->sc_lock);
clfree(&sc->sc_q);
free(sc->sc_obuf, M_USBDEV);
