From 180507d5094430458abaf47cf79789449fd20010 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 12 Jun 2021 13:05:15 +0000 Subject: [PATCH] usb(4): Cancel and wait for async task on closing pipe. XXX usbd_kill_pipe and usbd_close_pipe should not be copypasta; there should be only one instance of this logic. --- sys/dev/usb/usbdi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 3c5c957c334b..44bdfb811bd6 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -327,6 +327,8 @@ usbd_close_pipe(struct usbd_pipe *pipe) } usbd_unlock_pipe(pipe); + usb_rem_task_wait(pipe->up_dev, &pipe->up_async_task, USB_TASKQ_DRIVER, + NULL); kmem_free(pipe, pipe->up_dev->ud_bus->ub_pipesize); return USBD_NORMAL_COMPLETION;