summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-11-24 19:08:33 +0000
committerderaadt <deraadt@openbsd.org>2009-11-24 19:08:33 +0000
commit052d00cdcad3640ceb9d2ee650f8ecada45b1d2e (patch)
treeb2fb7ee2ce3a7d33766293b45c815903208ffb2d
parentUpdate the ENOTSUP summary and description. (diff)
downloadwireguard-openbsd-052d00cdcad3640ceb9d2ee650f8ecada45b1d2e.tar.xz
wireguard-openbsd-052d00cdcad3640ceb9d2ee650f8ecada45b1d2e.zip
at close() get rid of the usb task before we start tearing down; ok mglocker
-rw-r--r--sys/dev/usb/uvideo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 82cd8f062b0..60db053ec81 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.129 2009/10/26 15:34:16 deraadt Exp $ */
+/* $OpenBSD: uvideo.c,v 1.130 2009/11/24 19:08:33 deraadt Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -395,6 +395,9 @@ uvideo_close(void *addr)
DPRINTF(1, "%s: uvideo_close: sc=%p\n", DEVNAME(sc), sc);
+#ifdef UVIDEO_DUMP
+ usb_rem_task(sc->sc_udev, &sc->sc_task_write);
+#endif
/* close video stream pipe */
uvideo_vs_close(sc);
@@ -406,9 +409,6 @@ uvideo_close(void *addr)
/* free video stream frame buffer */
uvideo_vs_free_frame(sc);
-#ifdef UVIDEO_DUMP
- usb_rem_task(sc->sc_udev, &sc->sc_task_write);
-#endif
return (0);
}