Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / drivers / usb / core / quirks.c

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index f08ec85a6d647eafbb6d8961a278783136cf0682..739f520908aa939b30a09e54bd3a9627b6ceb0a5 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -42,7 +42,7 @@ static void usb_autosuspend_quirk(struct usb_device *udev)
 {
 #ifdef CONFIG_USB_SUSPEND
        /* disable autosuspend, but allow the user to re-enable it via sysfs */
-       udev->autosuspend_delay = 0;
+       udev->autosuspend_disabled = 1;
 #endif
 }