Module Name: src
Committed By: mrg
Date: Mon Feb 20 05:09:36 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: usbdi.c
Log Message:
timeout_handle callout is MPSAFE, mark it as such.
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.7 -r1.134.2.8 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.134.2.7 src/sys/dev/usb/usbdi.c:1.134.2.8
--- src/sys/dev/usb/usbdi.c:1.134.2.7 Mon Feb 20 02:12:24 2012
+++ src/sys/dev/usb/usbdi.c Mon Feb 20 05:09:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.134.2.7 2012/02/20 02:12:24 mrg Exp $ */
+/* $NetBSD: usbdi.c,v 1.134.2.8 2012/02/20 05:09:36 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.7 2012/02/20 02:12:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.8 2012/02/20 05:09:36 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
@@ -387,7 +387,8 @@ usbd_alloc_xfer(usbd_device_handle dev)
if (xfer == NULL)
return (NULL);
xfer->device = dev;
- callout_init(&xfer->timeout_handle, 0);
+ callout_init(&xfer->timeout_handle,
+ dev->bus->methods->get_locks ? CALLOUT_MPSAFE : 0);
cv_init(&xfer->cv, "usbxfer");
cv_init(&xfer->hccv, "usbhcxfer");
DPRINTFN(5,("usbd_alloc_xfer() = %p\n", xfer));
