Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fda953f authored by Lan Tianyu's avatar Lan Tianyu Committed by Greg Kroah-Hartman
Browse files

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: default avatarLan Tianyu <tianyu.lan@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d366846

drivers/usb/core/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void usb_detect_quirks(struct usb_device *udev) 
	 * for all devices.  It will affect things like hub resets

	 * and EMF-related port disables.

	 */

	if (!(udev->quirks & USB_QUIRK_RESET_MORPHS))

	if (!(udev->quirks & USB_QUIRK_RESET))

		udev->persist_enabled = 1;

#endif	/* CONFIG_PM */

}

drivers/usb/core/sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ show_avoid_reset_quirk(struct device *dev, struct device_attribute *attr, char * 
	struct usb_device *udev;



	udev = to_usb_device(dev);

	return sprintf(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET_MORPHS));

	return sprintf(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET));

}



static ssize_t
@@ -210,9 +210,9 @@ set_avoid_reset_quirk(struct device *dev, struct device_attribute *attr, 
		return -EINVAL;

	usb_lock_device(udev);

	if (val)

		udev->quirks |= USB_QUIRK_RESET_MORPHS;

		udev->quirks |= USB_QUIRK_RESET;

	else

		udev->quirks &= ~USB_QUIRK_RESET_MORPHS;

		udev->quirks &= ~USB_QUIRK_RESET;

	usb_unlock_device(udev);

	return count;

}

drivers/usb/storage/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -1331,7 +1331,7 @@ int usb_stor_port_reset(struct us_data *us) 
	int result;



	/*for these devices we must use the class specific method */

	if (us->pusb_dev->quirks & USB_QUIRK_RESET_MORPHS)

	if (us->pusb_dev->quirks & USB_QUIRK_RESET)

		return -EPERM;



	result = usb_lock_device_for_reset(us->pusb_dev, us->pusb_intf);

include/linux/usb/quirks.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
/* device can't handle its Configuration or Interface strings */

#define USB_QUIRK_CONFIG_INTF_STRINGS	0x00000008



/*device will morph if reset, don't use reset for handling errors */

#define USB_QUIRK_RESET_MORPHS		0x00000010

/* device can't be reset(e.g morph devices), don't use reset */

#define USB_QUIRK_RESET			0x00000010



/* device has more interface descriptions than the bNumInterfaces count,

   and can't handle talking to these interfaces */