Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB merge for 3.9-rc1

  Nothing major, lots of gadget fixes, and of course, xhci stuff.

  All of this has been in linux-next for a while, with the exception of
  the last 3 patches, which were reverts of patches in the tree that
  caused problems, they went in yesterday."

* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
  Revert "USB: EHCI: make ehci-vt8500 a separate driver"
  Revert "USB: EHCI: make ehci-orion a separate driver"
  Revert "USB: update host controller Kconfig entries"
  USB: update host controller Kconfig entries
  USB: EHCI: make ehci-orion a separate driver
  USB: EHCI: make ehci-vt8500 a separate driver
  USB: usb-storage: unusual_devs update for Super TOP SATA bridge
  USB: ehci-omap: Fix autoloading of module
  USB: ehci-omap: Don't free gpios that we didn't request
  USB: option: add Huawei "ACM" devices using protocol = vendor
  USB: serial: fix null-pointer dereferences on disconnect
  USB: option: add Yota / Megafon M100-1 4g modem
  drivers/usb: add missing GENERIC_HARDIRQS dependencies
  USB: storage: properly handle the endian issues of idProduct
  testusb: remove all mentions of 'usbfs'
  usb: gadget: imx_udc: make it depend on BROKEN
  usb: omap_control_usb: fix compile warning
  ARM: OMAP: USB: Add phy binding information
  ARM: OMAP2: MUSB: Specify omap4 has mailbox
  ARM: OMAP: devices: create device for usb part of control module
  ...

1 files changed, 15 insertions, 16 deletions

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 4f64d24eebc8..4a86b63745b8 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -453,20 +453,19 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
 
         if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) {
                 if (status & USBSTS_HSE)
-                        dev_err(uhci_dev(uhci), "host system error, "
-                                        "PCI problems?\n");
+                        dev_err(uhci_dev(uhci),
+                                "host system error, PCI problems?\n");
                 if (status & USBSTS_HCPE)
-                        dev_err(uhci_dev(uhci), "host controller process "
-                                        "error, something bad happened!\n");
+                        dev_err(uhci_dev(uhci),
+                                "host controller process error, something bad happened!\n");
                 if (status & USBSTS_HCH) {
                         if (uhci->rh_state >= UHCI_RH_RUNNING) {
                                 dev_err(uhci_dev(uhci),
-                                        "host controller halted, "
-                                        "very bad!\n");
+                                        "host controller halted, very bad!\n");
                                 if (debug > 1 && errbuf) {
                                         /* Print the schedule for debugging */
-                                        uhci_sprint_schedule(uhci,
-                                                        errbuf, ERRBUF_LEN);
+                                        uhci_sprint_schedule(uhci, errbuf,
+                                                ERRBUF_LEN - EXTRA_SPACE);
                                         lprintk(errbuf);
                                 }
                                 uhci_hc_died(uhci);
@@ -592,8 +591,8 @@ static int uhci_start(struct usb_hcd *hcd)
                         UHCI_NUMFRAMES * sizeof(*uhci->frame),
                         &uhci->frame_dma_handle, 0);
         if (!uhci->frame) {
-                dev_err(uhci_dev(uhci), "unable to allocate "
-                                "consistent memory for frame list\n");
+                dev_err(uhci_dev(uhci),
+                        "unable to allocate consistent memory for frame list\n");
                 goto err_alloc_frame;
         }
         memset(uhci->frame, 0, UHCI_NUMFRAMES * sizeof(*uhci->frame));
@@ -601,8 +600,8 @@ static int uhci_start(struct usb_hcd *hcd)
         uhci->frame_cpu = kcalloc(UHCI_NUMFRAMES, sizeof(*uhci->frame_cpu),
                         GFP_KERNEL);
         if (!uhci->frame_cpu) {
-                dev_err(uhci_dev(uhci), "unable to allocate "
-                                "memory for frame pointers\n");
+                dev_err(uhci_dev(uhci),
+                        "unable to allocate memory for frame pointers\n");
                 goto err_alloc_frame_cpu;
         }
 
@@ -737,8 +736,8 @@ static int uhci_rh_suspend(struct usb_hcd *hcd)
          */
         else if (hcd->self.root_hub->do_remote_wakeup &&
                         uhci->resuming_ports) {
-                dev_dbg(uhci_dev(uhci), "suspend failed because a port "
-                                "is resuming\n");
+                dev_dbg(uhci_dev(uhci),
+                        "suspend failed because a port is resuming\n");
                 rc = -EBUSY;
         } else
                 suspend_rh(uhci, UHCI_RH_SUSPENDED);
@@ -829,8 +828,8 @@ static int uhci_count_ports(struct usb_hcd *hcd)
 
         /* Anything greater than 7 is weird so we'll ignore it. */
         if (port > UHCI_RH_MAXCHILD) {
-                dev_info(uhci_dev(uhci), "port count misdetected? "
-                                "forcing to 2 ports\n");
+                dev_info(uhci_dev(uhci),
+                        "port count misdetected? forcing to 2 ports\n");
                 port = 2;
         }