Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-next

Omapdss driver changes for 3.5 merge window.

Lots of normal development commits, but perhaps most notable changes are:

* HDMI rework to properly decouple the HDMI audio part from the HDMI video part.
* Restructure omapdss core driver so that it's possible to implement device
  tree support. This included changing how platform data is passed to the
  drivers, changing display device registration and improving the panel driver's
  ability to configure the underlying video output interface.
* Basic support for DSI packet interleaving

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index f8e2d6d52e5c..9a56635dc19c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1189,8 +1189,13 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
         if (status == 0) {
                 status = usb_suspend_device(udev, msg);
 
-                /* Again, ignore errors during system sleep transitions */
-                if (!PMSG_IS_AUTO(msg))
+                /*
+                 * Ignore errors from non-root-hub devices during
+                 * system sleep transitions.  For the most part,
+                 * these devices should go to low power anyway when
+                 * the entire bus is suspended.
+                 */
+                if (udev->parent && !PMSG_IS_AUTO(msg))
                         status = 0;
         }