diff options
| author | Peter Chen <peter.chen@freescale.com> | 2010-09-27 16:43:25 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 10:22:05 -0700 |
| commit | 7491f13367919d97525b73b1fd38801ac83aac06 (patch) | |
| tree | ff26bd3a16a6e9ee07f1671288314317b56265a3 /drivers/usb/core | |
| parent | 00914025cc4e783d4703b4db1d47b41f389e50c8 (diff) | |
| download | talos-obmc-linux-7491f13367919d97525b73b1fd38801ac83aac06.tar.gz talos-obmc-linux-7491f13367919d97525b73b1fd38801ac83aac06.zip | |
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 <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index d7a4401ef019..c0e60fbcb048 100644 --- 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; } |
