diff options
| author | riastradh <riastradh@NetBSD.org> | 2021-06-12 15:40:07 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2021-06-12 15:40:07 +0000 |
| commit | 2718f4b09daa023e5e91ce4df115ff9ac96ab5ec (patch) | |
| tree | 66642b30b402339d359b81f05378cfad44ed2a46 /sys/dev | |
| parent | dc96aed2be7fbe13bcfb2ee84cd626bb804df6c7 (diff) | |
usb(4): Tweak style in usbd_close_pipe.
No functional change intended.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usbdi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 2a0d53ca949..67d61ca2a67 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.212 2021/06/12 15:39:57 riastradh Exp $ */ +/* $NetBSD: usbdi.c,v 1.213 2021/06/12 15:40:07 riastradh Exp $ */ /* * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.212 2021/06/12 15:39:57 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.213 2021/06/12 15:40:07 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -303,19 +303,16 @@ usbd_close_pipe(struct usbd_pipe *pipe) usbd_lock_pipe(pipe); SDT_PROBE1(usb, device, pipe, close, pipe); - if (!SIMPLEQ_EMPTY(&pipe->up_queue)) { printf("WARNING: pipe closed with active xfers on addr %d\n", pipe->up_dev->ud_addr); usbd_ar_pipe(pipe); } - KASSERT(SIMPLEQ_EMPTY(&pipe->up_queue)); - pipe->up_methods->upm_close(pipe); - usbd_unlock_pipe(pipe); - if (pipe->up_intrxfer != NULL) + + if (pipe->up_intrxfer) usbd_destroy_xfer(pipe->up_intrxfer); usb_rem_task_wait(pipe->up_dev, &pipe->up_async_task, USB_TASKQ_DRIVER, NULL); |
