Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param

[linux-2.6-omap-h63xx.git] / drivers / usb / core / generic.c

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 7e912f21fd365fc7240bc8c698c43ce2a817cc6b..30ecac3af15a4a3749750b680f4e66b2aa284912 100644 (file)
--- 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)
         * interfaces manually by doing a bus (or "global") suspend.
         */
        if (!udev->parent)
-               rc = hcd_bus_suspend(udev);
+               rc = hcd_bus_suspend(udev, msg);
 
        /* Non-root devices don't need to do anything for FREEZE or PRETHAW */
        else if (msg.event == PM_EVENT_FREEZE || msg.event == PM_EVENT_PRETHAW)
                rc = 0;
        else
-               rc = usb_port_suspend(udev);
+               rc = usb_port_suspend(udev, msg);
 
        return rc;
 }
 
-static int generic_resume(struct usb_device *udev)
+static int generic_resume(struct usb_device *udev, pm_message_t msg)
 {
        int rc;
 
@@ -221,9 +221,9 @@ static int generic_resume(struct usb_device *udev)
         * interfaces manually by doing a bus (or "global") resume.
         */
        if (!udev->parent)
-               rc = hcd_bus_resume(udev);
+               rc = hcd_bus_resume(udev, msg);
        else
-               rc = usb_port_resume(udev);
+               rc = usb_port_resume(udev, msg);
        return rc;
 }