 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb_subr.c,v 1.198.2.33 2016/10/07 10:35:25 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.198.2.34 2016/10/07 10:37:42 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998, 2004 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.
+ *
  * 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: usb_subr.c,v 1.198.2.33 2016/10/07 10:35:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.34 2016/10/07 10:37:42 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
 #include "opt_usbverbose.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 @@ -1543,27 +1543,27 @@ usbd_fill_deviceinfo(struct usbd_device
 		di->udi_devnames[j][0] = 0;                 /* empty */
 	if (!dev->ud_hub) {
 		di->udi_nports = 0;
 		return;
+	}
 	const int nports = dev->ud_hub->uh_hubdesc.bNbrPorts;
 	for (i = 0; i < __arraycount(di->udi_ports) && i < nports; i++) {
 		p = &dev->ud_hub->uh_ports[i];
 		if (p->up_dev)
 			err = p->up_dev->ud_addr;
 		else {
-			int s = UGETW(p->up_status.wPortStatus);
+			const int s = UGETW(p->up_status.wPortStatus);
 			const bool sshub_p = USB_IS_SS(dev->ud_speed);
 			if (s & UPS_PORT_ENABLED)
 				err = USB_PORT_ENABLED;
 			else if (s & UPS_SUSPEND)
 				err = USB_PORT_SUSPENDED;
 			/*
 			 * Note: UPS_PORT_POWER_SS is available only
 			 * on 3.x, and UPS_PORT_POWER is available
 			 * only on 2.0 or 1.1.
 			 */
 			else if (sshub_p && (s & UPS_PORT_POWER_SS))
 				err = USB_PORT_POWERED;
 			else if (!sshub_p && (s & UPS_PORT_POWER))
 @@ -1619,27 +1619,27 @@ usbd_fill_deviceinfo_old(struct usbd_dev
 	if (!dev->ud_hub) {
 		di->udi_nports = 0;
 		return;
+	}
 	const int nports = dev->ud_hub->uh_hubdesc.bNbrPorts;
 	for (i = 0; i < __arraycount(di->udi_ports) && i < nports;
 	     i++) {
 		p = &dev->ud_hub->uh_ports[i];
 		if (p->up_dev)
 			err = p->up_dev->ud_addr;
 		else {
-			int s = UGETW(p->up_status.wPortStatus);
+			const int s = UGETW(p->up_status.wPortStatus);
 			if (s & UPS_PORT_ENABLED)
 				err = USB_PORT_ENABLED;
 			else if (s & UPS_SUSPEND)
 				err = USB_PORT_SUSPENDED;
 			else if (s & UPS_PORT_POWER)
 				err = USB_PORT_POWERED;
 			else
 				err = USB_PORT_DISABLED;
+		}
 		di->udi_ports[i] = err;
+	}
 	di->udi_nports = nports;
+}