 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.162.2.11 2015/03/05 08:34:47 skrll Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.162.2.12 2015/03/05 08:48:07 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2012 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 and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,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.162.2.11 2015/03/05 08:34:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.12 2015/03/05 08:48:07 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include "usb_dma.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -221,26 +221,27 @@ usbd_open_pipe_intr(usbd_interface_handl
 	if (xfer == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	void *buf = usbd_alloc_buffer(xfer, len);
 	if (buf == NULL) {
 		err = ENOMEM;
 		goto bad2;
+	}
 	usbd_setup_xfer(xfer, ipipe, priv, buffer, len, flags,
 	    USBD_NO_TIMEOUT, cb);
 	ipipe->up_intrxfer = xfer;
 	ipipe->up_intrbuf = buf;
 	ipipe->up_repeat = 1;
 	err = usbd_transfer(xfer);
 	*pipe = ipipe;
 	if (err != USBD_IN_PROGRESS)
 		goto bad3;
 	return USBD_NORMAL_COMPLETION;
  bad3:
 	ipipe->up_intrxfer = NULL;
 	ipipe->up_repeat = 0;
  bad2:
 	usbd_free_xfer(xfer);
  bad1:
 @@ -264,28 +265,30 @@ usbd_close_pipe(usbd_pipe_handle pipe)
 	usbd_lock_pipe(pipe);
 	if (--pipe->up_refcnt != 0) {
 		usbd_unlock_pipe(pipe);
 		return USBD_NORMAL_COMPLETION;
+	}
 	if (! SIMPLEQ_EMPTY(&pipe->up_queue)) {
 		usbd_unlock_pipe(pipe);
 		return USBD_PENDING_REQUESTS;
+	}
 	LIST_REMOVE(pipe, up_next);
 	pipe->up_endpoint->ue_refcnt--;
 	pipe->up_methods->upm_close(pipe);
 	usbd_unlock_pipe(pipe);
-	if (pipe->up_intrxfer != NULL)
+	if (pipe->up_intrxfer != NULL) {
 		usbd_free_xfer(pipe->up_intrxfer);
 		usbd_free_buffer(pipe->up_intrbuf);
+	}
 	kmem_free(pipe, pipe->up_dev->ud_bus->ub_pipesize);
 	return USBD_NORMAL_COMPLETION;
+}
 usbd_status
 usbd_transfer(usbd_xfer_handle xfer)
+{
 	usbd_pipe_handle pipe = xfer->ux_pipe;
 	usbd_status err;
 	unsigned int size, flags;
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 @@ -1059,44 +1062,44 @@ usbd_do_request_flags(usbd_device_handle
 		      void *data, uint16_t flags, int *actlen, uint32_t timo)
+{
 	return (usbd_do_request_flags_pipe(dev, dev->ud_pipe0, req,
 					   data, flags, actlen, timo));
+}
 usbd_status
 usbd_do_request_flags_pipe(usbd_device_handle dev, usbd_pipe_handle pipe,
 	usb_device_request_t *req, void *data, uint16_t flags, int *actlen,
 	uint32_t timeout)
+{
 	usbd_xfer_handle xfer;
 	usbd_status err;
 	void *buf = NULL;
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	ASSERT_SLEEPABLE();
 	xfer = usbd_alloc_xfer(dev);
 	if (xfer == NULL)
 		return USBD_NOMEM;
 	if (UGETW(req->wLength) != 0) {
-		void *buf = usbd_alloc_buffer(xfer, UGETW(req->wLength));
+		buf = usbd_alloc_buffer(xfer, UGETW(req->wLength));
 		if (buf == NULL) {
 			err = ENOMEM;
 			goto bad;
+		}
+	}
 	usbd_setup_default_xfer(xfer, dev, 0, timeout, req,
 				data, UGETW(req->wLength), flags, 0);
 	xfer->ux_pipe = pipe;
 	err = usbd_sync_transfer(xfer);
 #if defined(USB_DEBUG) || defined(DIAGNOSTIC)
 	if (xfer->ux_actlen > xfer->ux_length) {
 		USBHIST_LOG(usbdebug, "overrun addr = %d type = 0x%02x",
 		    dev->ud_addr, xfer->ux_request.bmRequestType, 0, 0);
 		USBHIST_LOG(usbdebug, "     req = 0x%02x val = %d index = %d",
 		    xfer->ux_request.bRequest, UGETW(xfer->ux_request.wValue),
 		    UGETW(xfer->ux_request.wIndex), 0);
 		USBHIST_LOG(usbdebug, "     rlen = %d length = %d actlen = %d",
 		    UGETW(xfer->ux_request.wLength),
 @@ -1139,26 +1142,28 @@ usbd_do_request_flags_pipe(usbd_device_h
 		usbd_setup_default_xfer(xfer, dev, 0, USBD_DEFAULT_TIMEOUT,
 					   &treq, &status, 0, 0, 0);
 		nerr = usbd_sync_transfer(xfer);
 		if (nerr)
 			goto bad;
+	}
  bad:
 	if (err) {
 		USBHIST_LOG(usbdebug, "returning err = %s",
 		    usbd_errstr(err), 0, 0, 0);
+	}
 	usbd_free_xfer(xfer);
 	if (buf)
 		usbd_free_buffer(buf);
 	return err;
+}
 const struct usbd_quirks *
 usbd_get_quirks(usbd_device_handle dev)
+{
 #ifdef DIAGNOSTIC
 	if (dev == NULL) {
 		printf("usbd_get_quirks: dev == NULL\n");
 		return 0;
+	}
 #endif
 	return dev->ud_quirks;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.109.2.12 2015/03/05 08:34:47 skrll Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.109.2.13 2015/03/05 08:48:07 skrll Exp $	*/
 /*
  * Copyright (c) 1998, 2012 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 and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -215,26 +215,27 @@ struct usbd_interface {
 struct usbd_pipe {
 	struct usbd_interface  *up_iface;
 	struct usbd_device     *up_dev;
 	struct usbd_endpoint   *up_endpoint;
 	int			up_refcnt;
 	char			up_running;
 	char			up_aborting;
 	SIMPLEQ_HEAD(, usbd_xfer) up_queue;
 	LIST_ENTRY(usbd_pipe)	up_next;
 	struct usb_task		up_async_task;
 	usbd_xfer_handle	up_intrxfer; /* used for repeating requests */
 	void 		       *up_intrbuf;
 	char			up_repeat;
 	int			up_interval;
 	uint8_t			up_flags;
 	/* Filled by HC driver. */
 	const struct usbd_pipe_methods *up_methods;
 };
 struct usbd_xfer {
 	struct usbd_pipe       *ux_pipe;
 	void		       *ux_priv;
 	void		       *ux_buffer;
 	kcondvar_t		ux_cv;