 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb_subr.c,v 1.203 2015/10/26 15:07:07 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.204 2015/11/08 23:25:17 joerg 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.203 2015/10/26 15:07:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.204 2015/11/08 23:25:17 joerg 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/malloc.h>
 #include <sys/device.h>
 #include <sys/select.h>
 @@ -781,26 +781,44 @@ usbd_attach_roothub(device_t parent, usb
 	uaa.proto = dd->bDeviceProtocol;
 	dv = config_found_ia(parent, "usbroothubif", &uaa, 0);
 	if (dv) {
 		dev->subdevs = malloc(sizeof dv, M_USB, M_NOWAIT);
 		if (dev->subdevs == NULL)
 			return (USBD_NOMEM);
 		dev->subdevs[0] = dv;
 		dev->subdevlen = 1;
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 static void
 usbd_serialnumber(device_t dv, usbd_device_handle dev)
+{
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	char *serialnumber;
 	serialnumber = malloc(USB_MAX_ENCODED_STRING_LEN, M_USB, M_NOWAIT);
 	if (serialnumber == NULL)
 		return;
 	serialnumber[0] = '\0';
 	(void)usbd_get_string(dev, dd->iSerialNumber, serialnumber);
 	if (serialnumber[0]) {
 		prop_dictionary_set_cstring(device_properties(dv),
 		    "serialnumber", serialnumber);
+	}
 	free(serialnumber, M_USB);
+}
 static usbd_status
 usbd_attachwholedevice(device_t parent, usbd_device_handle dev, int port,
 	int usegeneric)
+{
 	struct usb_attach_arg uaa;
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	device_t dv;
 	int dlocs[USBDEVIFCF_NLOCS];
 	uaa.device = dev;
 	uaa.usegeneric = usegeneric;
 	uaa.port = port;
 	uaa.vendor = UGETW(dd->idVendor);
 @@ -817,26 +835,27 @@ usbd_attachwholedevice(device_t parent,
 	/* the rest is historical ballast */
 	dlocs[USBDEVIFCF_CONFIGURATION] = -1;
 	dlocs[USBDEVIFCF_INTERFACE] = -1;
 	dv = config_found_sm_loc(parent, "usbdevif", dlocs, &uaa, usbd_print,
 				 config_stdsubmatch);
 	if (dv) {
 		dev->subdevs = malloc(sizeof dv, M_USB, M_NOWAIT);
 		if (dev->subdevs == NULL)
 			return (USBD_NOMEM);
 		dev->subdevs[0] = dv;
 		dev->subdevlen = 1;
 		dev->nifaces_claimed = 1; /* XXX */
 		usbd_serialnumber(dv, dev);
+	}
 	return (USBD_NORMAL_COMPLETION);
+}
 static usbd_status
 usbd_attachinterfaces(device_t parent, usbd_device_handle dev,
 		      int port, const int *locators)
+{
 	struct usbif_attach_arg uiaa;
 	int ilocs[USBIFIFCF_NLOCS];
 	usb_device_descriptor_t *dd = &dev->ddesc;
 	int nifaces;
 	usbd_interface_handle *ifaces;
 @@ -887,26 +906,29 @@ usbd_attachinterfaces(device_t parent, u
 			loc = locators[USBIFIFCF_CONFIGURATION];
 			if (loc != USBIFIFCF_CONFIGURATION_DEFAULT &&
 			    loc != uiaa.configno)
 				continue;
 			loc = locators[USBIFIFCF_INTERFACE];
 			if (loc != USBIFIFCF_INTERFACE_DEFAULT &&
 			    loc != uiaa.ifaceno)
 				continue;
+		}
 		dv = config_found_sm_loc(parent, "usbifif", ilocs, &uiaa,
 					 usbd_ifprint, config_stdsubmatch);
 		if (!dv)
 			continue;
 		usbd_serialnumber(dv, dev);
 		/* claim */
 		ifaces[i] = NULL;
 		/* account for ifaces claimed by the driver behind our back */
 		for (j = 0; j < nifaces; j++) {
 			if (!ifaces[j] && !dev->subdevs[j]) {
 				DPRINTF(("%s: interface %d claimed "
 				    "behind our back\n", __func__, j));
 				dev->subdevs[j] = dv;
 				dev->nifaces_claimed++;
+			}
+		}
+	}