USB: deprecate the power/level sysfs attribute

[safe/jmp/linux-2.6] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5ac27ed..2a767b3 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1783,7 +1783,6 @@ int usb_new_device(struct usb_device *udev)
                 * sysfs power/wakeup controls wakeup enabled/disabled
                 */
                device_init_wakeup(&udev->dev, 0);
-               device_set_wakeup_enable(&udev->dev, 1);
        }
 
        /* Tell the runtime-PM framework the device is active */
@@ -3037,7 +3036,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
                /* maybe switch power back on (e.g. root hub was reset) */
                if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
-                               && !(portstatus & (1 << USB_PORT_FEAT_POWER)))
+                               && !(portstatus & USB_PORT_STAT_POWER))
                        set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
 
                if (portstatus & USB_PORT_STAT_ENABLE)