diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2008-03-06 11:04:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:33 -0400 |
commit | 9214d1d80c19016172e685ce7bde0ea757c49097 (patch) | |
tree | 1d8a2c03125a78c56c2d37fd18f08894772b0c26 /drivers | |
parent | eb764c4be1e5db3ee34df5745e98cf2f148c7320 (diff) |
USB: enable USB-PERSIST by default
This patch (as1052) enables USB-PERSIST for all devices by default.
The user won't have to remember to enable it explicitly for devices
containing mounted filesystems.
Eventually userspace tools like hal may be able to set the persist
attribute automatically when a filesystem is mounted on a USB device.
When that time comes this patch can be reverted, if people think it
matters.
This approach has the advantage of giving the user the ability to turn
off USB-PERSIST for devices with mounted filesystems, rather than
making the kernel always assume it should be on.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/core/quirks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index f384edf35b44..2e2019390290 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
@@ -98,12 +98,14 @@ void usb_detect_quirks(struct usb_device *udev) | |||
98 | udev->autosuspend_disabled = 1; | 98 | udev->autosuspend_disabled = 1; |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #ifdef CONFIG_PM | 101 | /* For the present, all devices default to USB-PERSIST enabled */ |
102 | #if 0 /* was: #ifdef CONFIG_PM */ | ||
102 | /* Hubs are automatically enabled for USB-PERSIST */ | 103 | /* Hubs are automatically enabled for USB-PERSIST */ |
103 | if (udev->descriptor.bDeviceClass == USB_CLASS_HUB) | 104 | if (udev->descriptor.bDeviceClass == USB_CLASS_HUB) |
104 | udev->persist_enabled = 1; | 105 | udev->persist_enabled = 1; |
106 | |||
105 | #else | 107 | #else |
106 | /* In the absense of PM, we can safely enable USB-PERSIST | 108 | /* In the absence of PM, we can safely enable USB-PERSIST |
107 | * for all devices. It will affect things like hub resets | 109 | * for all devices. It will affect things like hub resets |
108 | * and EMF-related port disables. | 110 | * and EMF-related port disables. |
109 | */ | 111 | */ |