summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-12-18 12:14:21 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 14:53:23 -0800
commit5d3987796c7a747e5ed3ded1eb64a9632d52a1a4 (patch)
treef677d4014bd5e25d1f4ccac1862fd95655baedec /drivers/usb/core
parentd1b5b5c0a8a8204f0c51d5eb99736ecfb2fd5b4e (diff)
USB: storage: Never reset devices that will morph to an old mode
Some devices must be switched to a new mode to fully use them. A reset would make them revert to the old mode. Therefore a reset must not be used for error handling with such devices. Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/quirks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index ab93918d920..0b689224394 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -120,6 +120,7 @@ void usb_detect_quirks(struct usb_device *udev)
* for all devices. It will affect things like hub resets
* and EMF-related port disables.
*/
- udev->persist_enabled = 1;
+ if (!(udev->quirks & USB_QUIRK_RESET_MORPHS))
+ udev->persist_enabled = 1;
#endif /* CONFIG_PM */
}