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

Commit 0944e964 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Jiri Kosina
Browse files

HID: use generic driver for Logitech Unifying receivers if !CONFIG_HID_LOGITECH_DJ 



Before commit 534a7b8e ("HID: Add full support for Logitech Unifying
receivers") Logitech Unifying receiver can work as generic device
without special driver, after that commit these devices does not works
without special driver.

After this patch they will use generic driver if special driver is disabled.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 42fc04e5

drivers/hid/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -257,7 +257,9 @@ config HID_LOGITECH_DJ 
	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

	Unifying receivers are capable of pairing up to 6 Logitech compliant

	devices to the same receiver.

	devices to the same receiver. Without this driver it will be handled by

	generic USB_HID driver and all incomming events will be multiplexed

	into a single mouse and a single keyboard device.



config LOGITECH_FF

	bool "Logitech force feedback support"

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1463,8 +1463,10 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL) },

#if IS_ENABLED(CONFIG_HID_LOGITECH_DJ)

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },