]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
USB: don't enable remote wakeup by default
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 2 Apr 2010 17:21:33 +0000 (13:21 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:37 +0000 (13:21 -0700)
This patch (as1364) avoids enabling remote wakeup by default on all
non-root-hub USB devices.  Individual drivers or userspace will have
to enable it wherever it is needed, such as for keyboards or network
interfaces.  Note: This affects only system sleep, not autosuspend.

External hubs will continue to relay wakeup requests received from
downstream through their upstream port, even when remote wakeup is not
enabled for the hub itself.  Disabling remote wakeup on a hub merely
prevents it from generating wakeup requests in response to connect,
disconnect, and overcurrent events.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/hub.c

index 497dbb29744d720eb9417bf959c8c2c1d6ec2a80..2a767b3143a4ef8b4ff642024bc6282d8dedb483 100644 (file)
@@ -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 */