diff options
Diffstat (limited to 'drivers/usb/core/driver.c')
-rw-r--r-- | drivers/usb/core/driver.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 8da4801bb92..ca43a6f824a 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -1088,15 +1088,8 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) | |||
1088 | break; | 1088 | break; |
1089 | } | 1089 | } |
1090 | } | 1090 | } |
1091 | if (status == 0) { | 1091 | if (status == 0) |
1092 | |||
1093 | /* Non-root devices don't need to do anything for FREEZE | ||
1094 | * or PRETHAW. */ | ||
1095 | if (udev->parent && (msg.event == PM_EVENT_FREEZE || | ||
1096 | msg.event == PM_EVENT_PRETHAW)) | ||
1097 | goto done; | ||
1098 | status = usb_suspend_device(udev, msg); | 1092 | status = usb_suspend_device(udev, msg); |
1099 | } | ||
1100 | 1093 | ||
1101 | /* If the suspend failed, resume interfaces that did get suspended */ | 1094 | /* If the suspend failed, resume interfaces that did get suspended */ |
1102 | if (status != 0) { | 1095 | if (status != 0) { |