 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.173.2.5 2019/01/11 15:52:24 martin Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.173.2.6 2024/03/12 12:36:17 martin 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.173.2.5 2019/01/11 15:52:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.173.2.6 2024/03/12 12:36:17 martin 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>
 @@ -1159,34 +1159,54 @@ usbd_get_quirks(struct usbd_device *dev)
 void
 usbd_dopoll(struct usbd_interface *iface)
+{
 	iface->ui_dev->ud_bus->ub_methods->ubm_dopoll(iface->ui_dev->ud_bus);
+}
 /*
  * This is for keyboard driver as well, which only operates in polling
  * mode from the ask root, etc., prompt and from DDB.
  */
 void
 usbd_set_polling(struct usbd_device *dev, int on)
+{
 	if (on)
 		dev->ud_bus->ub_usepolling++;
 	else
 		dev->ud_bus->ub_usepolling--;
 	/* Kick the host controller when switching modes */
 	mutex_enter(dev->ud_bus->ub_lock);
-	dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+	if (on) {
 		/*
 		 * Enabling polling.  If we're enabling for the first
 		 * time, call the softint routine on transition while
 		 * we hold the lock and polling is still disabled, and
 		 * then enable polling -- once polling is enabled, we
 		 * must not hold the lock when we call the softint
 		 * routine.
 		 */
 		KASSERT(dev->ud_bus->ub_usepolling < __type_max(char));
 		if (dev->ud_bus->ub_usepolling == 0)
 			dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
 		dev->ud_bus->ub_usepolling++;
 	} else {
 		/*
 		 * Disabling polling.  If we're disabling polling for
 		 * the last time, disable polling first and then call
 		 * the softint routine while we hold the lock -- until
 		 * polling is disabled, we must not hold the lock when
 		 * we call the softint routine.
 		 */
 		KASSERT(dev->ud_bus->ub_usepolling > 0);
 		dev->ud_bus->ub_usepolling--;
 		if (dev->ud_bus->ub_usepolling == 0)
 			dev->ud_bus->ub_methods->ubm_softint(dev->ud_bus);
+	}
 	mutex_exit(dev->ud_bus->ub_lock);
+}
 usb_endpoint_descriptor_t *
 usbd_get_endpoint_descriptor(struct usbd_interface *iface, uint8_t address)
+{
 	struct usbd_endpoint *ep;
 	int i;
 	for (i = 0; i < iface->ui_idesc->bNumEndpoints; i++) {
 		ep = &iface->ui_endpoints[i];
 		if (ep->ue_edesc->bEndpointAddress == address)