Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/usb_subr.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/usb_subr.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.225 retrieving revision 1.226 diff -u -p -r1.225 -r1.226 --- src/sys/dev/usb/usb_subr.c 2018/07/29 02:08:07 1.225 +++ src/sys/dev/usb/usb_subr.c 2018/08/02 06:09:04 1.226 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.225 2018/07/29 02:08:07 riastradh Exp $ */ +/* $NetBSD: usb_subr.c,v 1.226 2018/08/02 06:09:04 riastradh 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 -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.225 2018/07/29 02:08:07 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.226 2018/08/02 06:09:04 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -823,7 +823,8 @@ usbd_kill_pipe(struct usbd_pipe *pipe) usbd_lock_pipe(pipe); pipe->up_methods->upm_close(pipe); usbd_unlock_pipe(pipe); - usb_rem_task_wait(pipe->up_dev, &pipe->up_async_task, USB_TASKQ_DRIVER); + usb_rem_task_wait(pipe->up_dev, &pipe->up_async_task, USB_TASKQ_DRIVER, + NULL); pipe->up_endpoint->ue_refcnt--; kmem_free(pipe, pipe->up_dev->ud_bus->ub_pipesize); }