aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorLan Tianyu <tianyu.lan@intel.com>2012-08-17 04:44:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-20 17:38:08 -0400
commit7fda953ffed1b94aa68f80c6c3ab312328aedcb3 (patch)
tree13be546c8b34fac9b678cb02a024c9737d5af693 /drivers/usb/storage
parent2d366846598d5f562866bba61a836d9325878066 (diff)
usb: convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET
Since the attribute avoid_reset_quirk is work for all devices including those devices that can't morph, convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET. Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index c70109e5d60b..c0543c83923e 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -1331,7 +1331,7 @@ int usb_stor_port_reset(struct us_data *us)
1331 int result; 1331 int result;
1332 1332
1333 /*for these devices we must use the class specific method */ 1333 /*for these devices we must use the class specific method */
1334 if (us->pusb_dev->quirks & USB_QUIRK_RESET_MORPHS) 1334 if (us->pusb_dev->quirks & USB_QUIRK_RESET)
1335 return -EPERM; 1335 return -EPERM;
1336 1336
1337 result = usb_lock_device_for_reset(us->pusb_dev, us->pusb_intf); 1337 result = usb_lock_device_for_reset(us->pusb_dev, us->pusb_intf);