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

Commit 93362a87 authored by Phil Dibowitz's avatar Phil Dibowitz Committed by Greg Kroah-Hartman
Browse files

USB delay init quirk for logitech Harmony 700-series devices 



The Logitech Harmony 700 series needs an extra delay during
initialization.  This patch adds a USB quirk which enables such a delay
and adds the device to the quirks list.

Signed-off-by: default avatarPhil Dibowitz <phil@ipom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 33d973ad

drivers/usb/core/hub.c

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/usb.h>

#include <linux/usbdevice_fs.h>

#include <linux/usb/hcd.h>

#include <linux/usb/quirks.h>

#include <linux/kthread.h>

#include <linux/mutex.h>

#include <linux/freezer.h>
@@ -1802,7 +1803,6 @@ int usb_new_device(struct usb_device *udev) 
	pm_runtime_set_active(&udev->dev);

	pm_runtime_enable(&udev->dev);



	usb_detect_quirks(udev);

	err = usb_enumerate_device(udev);	/* Read descriptors */

	if (err < 0)

		goto fail;
@@ -3114,6 +3114,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
		if (status < 0)

			goto loop;



		usb_detect_quirks(udev);

		if (udev->quirks & USB_QUIRK_DELAY_INIT)

			msleep(1000);



		/* consecutive bus-powered hubs aren't reliable; they can

		 * violate the voltage drop budget.  if the new child has

		 * a "powered" LED, users should notice we didn't enable it

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Creative SB Audigy 2 NX */

	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Harmony 700-series */

	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },



	/* Philips PSC805 audio device */

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },

include/linux/usb/quirks.h

+4 −0
Original line number Diff line number Diff line
@@ -26,4 +26,8 @@ 
   and can't handle talking to these interfaces */

#define USB_QUIRK_HONOR_BNUMINTERFACES	0x00000020



/* device needs a pause during initialization, after we read the device

   descriptor */

#define USB_QUIRK_DELAY_INIT		0x00000040



#endif /* __LINUX_USB_QUIRKS_H */