diff options
Diffstat (limited to 'drivers/usb/core/generic.c')
-rw-r--r-- | drivers/usb/core/generic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 7e912f21fd3..30ecac3af15 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c | |||
@@ -200,18 +200,18 @@ static int generic_suspend(struct usb_device *udev, pm_message_t msg) | |||
200 | * interfaces manually by doing a bus (or "global") suspend. | 200 | * interfaces manually by doing a bus (or "global") suspend. |
201 | */ | 201 | */ |
202 | if (!udev->parent) | 202 | if (!udev->parent) |
203 | rc = hcd_bus_suspend(udev); | 203 | rc = hcd_bus_suspend(udev, msg); |
204 | 204 | ||
205 | /* Non-root devices don't need to do anything for FREEZE or PRETHAW */ | 205 | /* Non-root devices don't need to do anything for FREEZE or PRETHAW */ |
206 | else if (msg.event == PM_EVENT_FREEZE || msg.event == PM_EVENT_PRETHAW) | 206 | else if (msg.event == PM_EVENT_FREEZE || msg.event == PM_EVENT_PRETHAW) |
207 | rc = 0; | 207 | rc = 0; |
208 | else | 208 | else |
209 | rc = usb_port_suspend(udev); | 209 | rc = usb_port_suspend(udev, msg); |
210 | 210 | ||
211 | return rc; | 211 | return rc; |
212 | } | 212 | } |
213 | 213 | ||
214 | static int generic_resume(struct usb_device *udev) | 214 | static int generic_resume(struct usb_device *udev, pm_message_t msg) |
215 | { | 215 | { |
216 | int rc; | 216 | int rc; |
217 | 217 | ||
@@ -221,9 +221,9 @@ static int generic_resume(struct usb_device *udev) | |||
221 | * interfaces manually by doing a bus (or "global") resume. | 221 | * interfaces manually by doing a bus (or "global") resume. |
222 | */ | 222 | */ |
223 | if (!udev->parent) | 223 | if (!udev->parent) |
224 | rc = hcd_bus_resume(udev); | 224 | rc = hcd_bus_resume(udev, msg); |
225 | else | 225 | else |
226 | rc = usb_port_resume(udev); | 226 | rc = usb_port_resume(udev, msg); |
227 | return rc; | 227 | return rc; |
228 | } | 228 | } |
229 | 229 | ||