Module Name: src
Committed By: riastradh
Date: Sun Jul 29 02:00:59 UTC 2018
Modified Files:
src/sys/dev/usb: if_otus.c
Log Message:
Use usb_rem_task_wait in otus(4) detach.
No need for callout_halt: otus_stop already does it.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_otus.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/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.33 src/sys/dev/usb/if_otus.c:1.34
--- src/sys/dev/usb/if_otus.c:1.33 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/usb/if_otus.c Sun Jul 29 02:00:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.33 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_otus.c,v 1.34 2018/07/29 02:00:59 riastradh Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.33 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.34 2018/07/29 02:00:59 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -701,7 +701,7 @@ otus_detach(device_t self, int flags)
if (ifp != NULL) /* Failed to attach properly */
otus_stop(ifp);
- usb_rem_task(sc->sc_udev, &sc->sc_task);
+ usb_rem_task_wait(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER);
callout_destroy(&sc->sc_scan_to);
callout_destroy(&sc->sc_calib_to);