diff options
author | Lan Tianyu <tianyu.lan@intel.com> | 2012-08-17 04:44:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-20 17:38:08 -0400 |
commit | 7fda953ffed1b94aa68f80c6c3ab312328aedcb3 (patch) | |
tree | 13be546c8b34fac9b678cb02a024c9737d5af693 /drivers/usb/core/sysfs.c | |
parent | 2d366846598d5f562866bba61a836d9325878066 (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/core/sysfs.c')
-rw-r--r-- | drivers/usb/core/sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index d6c49d9ed4e0..818e4a024d0d 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c | |||
@@ -196,7 +196,7 @@ show_avoid_reset_quirk(struct device *dev, struct device_attribute *attr, char * | |||
196 | struct usb_device *udev; | 196 | struct usb_device *udev; |
197 | 197 | ||
198 | udev = to_usb_device(dev); | 198 | udev = to_usb_device(dev); |
199 | return sprintf(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET_MORPHS)); | 199 | return sprintf(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET)); |
200 | } | 200 | } |
201 | 201 | ||
202 | static ssize_t | 202 | static ssize_t |
@@ -210,9 +210,9 @@ set_avoid_reset_quirk(struct device *dev, struct device_attribute *attr, | |||
210 | return -EINVAL; | 210 | return -EINVAL; |
211 | usb_lock_device(udev); | 211 | usb_lock_device(udev); |
212 | if (val) | 212 | if (val) |
213 | udev->quirks |= USB_QUIRK_RESET_MORPHS; | 213 | udev->quirks |= USB_QUIRK_RESET; |
214 | else | 214 | else |
215 | udev->quirks &= ~USB_QUIRK_RESET_MORPHS; | 215 | udev->quirks &= ~USB_QUIRK_RESET; |
216 | usb_unlock_device(udev); | 216 | usb_unlock_device(udev); |
217 | return count; | 217 | return count; |
218 | } | 218 | } |