Merge tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / drivers / usb / core / port.c

diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 8c1b2c509467bf1dae5ef83a8a4dd9064ab93a4d..d6b0fadf53e9de9d3c8b074c50be95b301e176e4 100644 (file)
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -86,7 +86,7 @@ static int usb_port_runtime_resume(struct device *dev)
        usb_autopm_get_interface(intf);
        set_bit(port1, hub->busy_bits);
 
-       retval = usb_hub_set_port_power(hdev, port1, true);
+       retval = usb_hub_set_port_power(hdev, hub, port1, true);
        if (port_dev->child && !retval) {
                /*
                 * Wait for usb hub port to be reconnected in order to make
@@ -128,7 +128,7 @@ static int usb_port_runtime_suspend(struct device *dev)
 
        usb_autopm_get_interface(intf);
        set_bit(port1, hub->busy_bits);
-       retval = usb_hub_set_port_power(hdev, port1, false);
+       retval = usb_hub_set_port_power(hdev, hub, port1, false);
        usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_CONNECTION);
        usb_clear_port_feature(hdev, port1,     USB_PORT_FEAT_C_ENABLE);
        clear_bit(port1, hub->busy_bits);