Module Name: src
Committed By: skrll
Date: Thu Dec 29 08:40:27 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c
Log Message:
Take bus lock while removing a device from the bus list and announce
detach once complete (not before)
To generate a diff of this commit:
cvs rdiff -u -r1.198.2.37 -r1.198.2.38 src/sys/dev/usb/usb_subr.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/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.37 src/sys/dev/usb/usb_subr.c:1.198.2.38
--- src/sys/dev/usb/usb_subr.c:1.198.2.37 Thu Dec 29 08:38:19 2016
+++ src/sys/dev/usb/usb_subr.c Thu Dec 29 08:40:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.198.2.38 2016/12/29 08:40:27 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.37 2016/12/29 08:38:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.38 2016/12/29 08:40:27 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1736,9 +1736,14 @@ usb_disconnect_port(struct usbd_port *up
KASSERT(!dev->ud_nifaces_claimed);
}
- usbd_add_dev_event(USB_EVENT_DEVICE_DETACH, dev);
+ mutex_enter(dev->ud_bus->ub_lock);
dev->ud_bus->ub_devices[dev->ud_addr] = NULL;
up->up_dev = NULL;
+ mutex_exit(dev->ud_bus->ub_lock);
+
+ usbd_add_dev_event(USB_EVENT_DEVICE_DETACH, dev);
+
usb_free_device(dev);
+
return 0;
}
