USB: storage: Never reset devices that will morph to an old mode

[net-next-2.6.git] / drivers / usb / core / quirks.c

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index ab93918d92076dedec3575b49e5eaacfb2c32e71..0b689224394b8ccb01da265313fdb21297ae2592 100644 (file)
--- 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 */
 }