aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-11-17 09:47:28 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-17 11:29:54 -0800
commitc9d00fc148b210aa8cf388d6e1eac187a0e855a6 (patch)
treebc6e85fc0f7f207b2d95e17acac37add6d96a104 /drivers/usb/storage
parentb0ce84d5539de88a1001f9aa3deeaa20fde3d152 (diff)
downloadkernel_samsung_smdk4412-c9d00fc148b210aa8cf388d6e1eac187a0e855a6.tar.gz
kernel_samsung_smdk4412-c9d00fc148b210aa8cf388d6e1eac187a0e855a6.tar.bz2
kernel_samsung_smdk4412-c9d00fc148b210aa8cf388d6e1eac187a0e855a6.zip
[PATCH] USB: onetouch doesn't suspend yet
The onetouch support doesn't suspend correctly (leaves an interrupt URB posted, instead of unlinking it) so for now just disable it when PM is in the air. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 1a9679f76f5..c41d64dbb0f 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -115,7 +115,7 @@ config USB_STORAGE_JUMPSHOT
config USB_STORAGE_ONETOUCH
bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
- depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL
+ depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
help
Say Y here to include additional code to support the Maxtor OneTouch
USB hard drive's onetouch button.