summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uvideo.c
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2010-10-23 15:42:11 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2010-10-23 15:42:11 +0000
commit8e12f85560fc6cbe21ee1d99ef2a764d08702ed2 (patch)
treeb9bbbae0787b3b58b834bb8bac476ea50fe8f4a2 /sys/dev/usb/uvideo.c
parent645084637a0c51eccc7292eb827eb5f5294adac8 (diff)
create another kthread to run xfer abort tasks. xfer abort tasks cannot
be run from the generic task kthread, because xfers that need to be aborted block newly queued tasks from running (i.e. the xfer to be aborted blocks the abort of that task). as there are now three types of usb tasks, add an argument to usb_init_task() and another member to struct usb_task to specify the task type. fixes boot hangs that are showing up because we now use usb tasks to attach/detach usb devices.
Diffstat (limited to 'sys/dev/usb/uvideo.c')
-rw-r--r--sys/dev/usb/uvideo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 770ee5f8510..98e2f3cf520 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.145 2010/10/18 23:25:31 jakemsr Exp $ */
+/* $OpenBSD: uvideo.c,v 1.146 2010/10/23 15:42:10 jakemsr Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -1802,7 +1802,8 @@ uvideo_vs_init(struct uvideo_softc *sc)
#ifdef UVIDEO_DUMP
if (uvideo_debug_file_open(sc) != 0)
return (USBD_INVAL);
- usb_init_task(&sc->sc_task_write, uvideo_debug_file_write_frame, sc);
+ usb_init_task(&sc->sc_task_write, uvideo_debug_file_write_frame, sc,
+ USB_TASK_TYPE_GENERIC);
#endif
return (USBD_NORMAL_COMPLETION);
}