From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:09:47 +0000 (-0800)
Subject: Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: upstream/snapshot3+hdmi~8421
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55b81e6f2795484ea8edf5805c95c007cacfa736;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'usb-next' of git://git./linux/kernel/git/gregkh/usb

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)
  USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
  xhci: Clean up 32-bit build warnings.
  USB: update documentation for usbmon
  usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
  drivers/usb/class/cdc-acm.c: clear dangling pointer
  drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree
  drivers/usb/host/isp1760-if.c: introduce missing kfree
  usb: option: add ZD Incorporated HSPA modem
  usb: ch9: fix up MaxStreams helper
  USB: usb-skeleton.c: cleanup open_count
  USB: usb-skeleton.c: fix open/disconnect race
  xhci: Properly handle COMP_2ND_BW_ERR
  USB: remove dead code from suspend/resume path
  USB: add quirk for another camera
  drivers: usb: wusbcore: Fix dependency for USB_WUSB
  xhci: Better debugging for critical host errors.
  xhci: Be less verbose during URB cancellation.
  xhci: Remove debugging about ring structure allocation.
  xhci: Remove debugging about toggling cycle bits.
  xhci: Remove debugging for individual transfers.
  ...
---

55b81e6f2795484ea8edf5805c95c007cacfa736
diff --cc drivers/usb/dwc3/debugfs.c
index fcfa915,87d403d..433c97c
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@@ -50,7 -49,13 +49,8 @@@
  #include "core.h"
  #include "gadget.h"
  #include "io.h"
+ #include "debug.h"
  
 -struct dwc3_register {
 -	const char	*name;
 -	u32		offset;
 -};
 -
  #define dump_register(nm)				\
  {							\
  	.name	= __stringify(nm),			\
diff --cc drivers/usb/renesas_usbhs/mod_host.c
index 7955de5,df8363d..1834cf5
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@@ -1267,14 -1515,7 +1515,8 @@@ int usbhs_mod_host_probe(struct usbhs_p
  		dev_err(dev, "Failed to create hcd\n");
  		return -ENOMEM;
  	}
 +	hcd->has_tt = 1; /* for low/full speed */
  
- 	pipe_info = kzalloc(sizeof(*pipe_info) * pipe_size, GFP_KERNEL);
- 	if (!pipe_info) {
- 		dev_err(dev, "Could not allocate pipe_info\n");
- 		goto usbhs_mod_host_probe_err;
- 	}
- 
  	/*
  	 * CAUTION
  	 *