 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.232 2022/03/03 06:12:49 riastradh Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.233 2022/03/03 06:13:23 riastradh Exp $	*/
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, Matthew R. Green (mrg@eterna.com.au),
  * and Nick Hudson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.232 2022/03/03 06:12:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.233 2022/03/03 06:13:23 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_compat_netbsd.h"
 #include "usb_dma.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 @@ -103,26 +103,42 @@ SDT_PROBE_DEFINE5(usb, device, xfer, cre
     "struct usbd_pipe *"/*pipe*/,
     "size_t"/*len*/,
     "unsigned int"/*flags*/,
     "unsigned int"/*nframes*/);
 SDT_PROBE_DEFINE1(usb, device, xfer, start,  "struct usbd_xfer *"/*xfer*/);
 SDT_PROBE_DEFINE1(usb, device, xfer, preabort,  "struct usbd_xfer *"/*xfer*/);
 SDT_PROBE_DEFINE1(usb, device, xfer, abort,  "struct usbd_xfer *"/*xfer*/);
 SDT_PROBE_DEFINE1(usb, device, xfer, timeout,  "struct usbd_xfer *"/*xfer*/);
 SDT_PROBE_DEFINE2(usb, device, xfer, done,
     "struct usbd_xfer *"/*xfer*/,
     "usbd_status"/*status*/);
 SDT_PROBE_DEFINE1(usb, device, xfer, destroy,  "struct usbd_xfer *"/*xfer*/);
 SDT_PROBE_DEFINE5(usb, device, request, start,
     "struct usbd_device *"/*dev*/,
     "usb_device_request_t *"/*req*/,
     "size_t"/*len*/,
     "int"/*flags*/,
     "uint32_t"/*timeout*/);
 SDT_PROBE_DEFINE7(usb, device, request, done,
     "struct usbd_device *"/*dev*/,
     "usb_device_request_t *"/*req*/,
     "size_t"/*actlen*/,
     "int"/*flags*/,
     "uint32_t"/*timeout*/,
     "void *"/*data*/,
     "usbd_status"/*status*/);
 Static void usbd_ar_pipe(struct usbd_pipe *);
 Static void usbd_start_next(struct usbd_pipe *);
 Static usbd_status usbd_open_pipe_ival
 	(struct usbd_interface *, uint8_t, uint8_t, struct usbd_pipe **, int);
 static void *usbd_alloc_buffer(struct usbd_xfer *, uint32_t);
 static void usbd_free_buffer(struct usbd_xfer *);
 static struct usbd_xfer *usbd_alloc_xfer(struct usbd_device *, unsigned int);
 static void usbd_free_xfer(struct usbd_xfer *);
 static void usbd_request_async_cb(struct usbd_xfer *, void *, usbd_status);
 static void usbd_xfer_timeout(void *);
 static void usbd_xfer_timeout_task(void *);
 static bool usbd_xfer_probe_timeout(struct usbd_xfer *);
 static void usbd_xfer_cancel_timeout_async(struct usbd_xfer *);
 @@ -1226,53 +1242,62 @@ usbd_do_request_len(struct usbd_device *
     size_t len, void *data, uint16_t flags, int *actlen, uint32_t timeout)
+{
 	struct usbd_xfer *xfer;
 	usbd_status err;
 	KASSERT(len >= UGETW(req->wLength));
 	USBHIST_FUNC();
 	USBHIST_CALLARGS(usbdebug, "dev=%#jx req=%jx flags=%jx len=%jx",
 	    (uintptr_t)dev, (uintptr_t)req, flags, len);
 	ASSERT_SLEEPABLE();
 	SDT_PROBE5(usb, device, request, start,
 	    dev, req, len, flags, timeout);
 	int error = usbd_create_xfer(dev->ud_pipe0, len, 0, 0, &xfer);
-	if (error)
+	if (error) {
 		SDT_PROBE7(usb, device, request, done,
 		    dev, req, /*actlen*/0, flags, timeout, data, USBD_NOMEM);
 		return USBD_NOMEM;
+	}
 	usbd_setup_default_xfer(xfer, dev, 0, timeout, req, data,
 	    UGETW(req->wLength), flags, NULL);
 	KASSERT(xfer->ux_pipe == dev->ud_pipe0);
 	err = usbd_sync_transfer(xfer);
 #if defined(USB_DEBUG) || defined(DIAGNOSTIC)
 	if (xfer->ux_actlen > xfer->ux_length) {
 		USBHIST_LOG(usbdebug, "overrun addr = %jd type = 0x%02jx",
 		    dev->ud_addr, xfer->ux_request.bmRequestType, 0, 0);
 		USBHIST_LOG(usbdebug, "     req = 0x%02jx val = %jd "
 		    "index = %jd",
 		    xfer->ux_request.bRequest, UGETW(xfer->ux_request.wValue),
 		    UGETW(xfer->ux_request.wIndex), 0);
 		USBHIST_LOG(usbdebug, "     rlen = %jd length = %jd "
 		    "actlen = %jd",
 		    UGETW(xfer->ux_request.wLength),
 		    xfer->ux_length, xfer->ux_actlen, 0);
+	}
 #endif
 	if (actlen != NULL)
 		*actlen = xfer->ux_actlen;
 	usbd_destroy_xfer(xfer);
 	SDT_PROBE7(usb, device, request, done,
 	    dev, req, xfer->ux_actlen, flags, timeout, data, err);
 	if (err) {
 		USBHIST_LOG(usbdebug, "returning err = %jd", err, 0, 0, 0);
+	}
 	return err;
+}
 static void
 usbd_request_async_cb(struct usbd_xfer *xfer, void *priv, usbd_status status)
+{
 	usbd_destroy_xfer(xfer);
+}
 /*