USB: do not print -ESHUTDOWN message if usb at otg device mode

At otg device mode, the otg host resume should do no-op during
system resume, otherwise, the otg device will be treated as a
host for enumeration.

So, the otg host driver returns -ESHUTDOWN if it detects the
current usb mode is device mode. The host driver has to return
-ESHUTDOWN, otherwise, the usb_hc_died will be called.

Signed-off-by: Peter Chen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d7a4401ef0192e2a0d4870a5d27bee082b35890a..c0e60fbcb048b245ac2d995fec508f5d654c1363 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1337,7 +1337,7 @@ int usb_resume(struct device *dev, pm_message_t msg)
        /* Avoid PM error messages for devices disconnected while suspended
         * as we'll display regular disconnect messages just a bit later.
         */
-       if (status == -ENODEV)
+       if (status == -ENODEV || status == -ESHUTDOWN)
                status = 0;
        return status;
 }