From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 05:42:53 +0000 (+1100)
Subject: Merge remote-tracking branch 'usb/usb-next'
X-Git-Tag: next-20111213~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb1de08d287e734ee4a454095e5db7a89844a092;p=karo-tx-linux.git

Merge remote-tracking branch 'usb/usb-next'
---

eb1de08d287e734ee4a454095e5db7a89844a092
diff --cc drivers/usb/dwc3/debugfs.c
index fcfa91517ea1,87d403df1f3f..433c97c15fc5
--- 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 7955de589951,75659e0c735d..e0229e1e9c75
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@@ -1267,9 -1267,8 +1267,9 @@@ 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);
+ 	pipe_info = kcalloc(pipe_size, sizeof(*pipe_info), GFP_KERNEL);
  	if (!pipe_info) {
  		dev_err(dev, "Could not allocate pipe_info\n");
  		goto usbhs_mod_host_probe_err;