From: Stephen Rothwell Date: Mon, 19 Dec 2011 06:09:22 +0000 (+1100) Subject: Merge remote-tracking branch 'usb/usb-next' X-Git-Tag: next-20111219~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc52392b3e339ba1f75ea614c4d2aacfc2f081d9;p=karo-tx-linux.git Merge remote-tracking branch 'usb/usb-next' --- dc52392b3e339ba1f75ea614c4d2aacfc2f081d9 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,aa50eaaffcb6..773b3f1cec74 --- a/drivers/usb/renesas_usbhs/mod_host.c +++ b/drivers/usb/renesas_usbhs/mod_host.c @@@ -1267,14 -1516,7 +1516,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 *