Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
  WUSB: correct format of wusb_chid sysfs file
  WUSB: fix oops when completing URBs for disconnected devices
  WUSB: disconnect all devices when stopping a WUSB HCD
  USB: whci-hcd: check return value of usb_hcd_link_urb_to_ep()
  USB: whci-hcd: provide a endpoint_reset method
  USB: add reset endpoint operations
  USB device codes for Motorola phone.
  usb-storage: fix mistake in Makefile
  USB: usb-serial ch341: support for DTR/RTS/CTS
  Revert USB: usb-serial ch341: support for DTR/RTS/CTS
  USB: musb: fix possible panic while resuming
  USB: musb: fix isochronous TXDMA (take 2)
  USB: musb: sanitize clearing TXCSR DMA bits (take 2)
  USB: musb: bugfixes for multi-packet TXDMA support
  USB: musb_host, fix ep0 fifo flushing
  USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab
  USB: musb_host, minor enqueue locking fix (v2)
  USB: fix oops in cdc-wdm in case of malformed descriptors
  USB: qcserial: Add extra device IDs
  USB: option: Add ids for D-Link DWM-652 3.5G modem
  ...

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 338cd1611ab3..0112353ec97d 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2170,26 +2170,22 @@ static int musb_suspend(struct platform_device *pdev, pm_message_t message)
         return 0;
 }
 
-static int musb_resume(struct platform_device *pdev)
+static int musb_resume_early(struct platform_device *pdev)
 {
-        unsigned long   flags;
         struct musb     *musb = dev_to_musb(&pdev->dev);
 
         if (!musb->clock)
                 return 0;
 
-        spin_lock_irqsave(&musb->lock, flags);
-
         if (musb->set_clock)
                 musb->set_clock(musb->clock, 1);
         else
                 clk_enable(musb->clock);
 
         /* for static cmos like DaVinci, register values were preserved
-         * unless for some reason the whole soc powered down and we're
-         * not treating that as a whole-system restart (e.g. swsusp)
+         * unless for some reason the whole soc powered down or the USB
+         * module got reset through the PSC (vs just being disabled).
          */
-        spin_unlock_irqrestore(&musb->lock, flags);
         return 0;
 }
 
@@ -2207,7 +2203,7 @@ static struct platform_driver musb_driver = {
         .remove         = __devexit_p(musb_remove),
         .shutdown       = musb_shutdown,
         .suspend        = musb_suspend,
-        .resume         = musb_resume,
+        .resume_early   = musb_resume_early,
 };
 
 /*-------------------------------------------------------------------------*/