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

Commit 8b66a16f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'uc-logic' into for-linus 

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c
parents bbd128b5 41fa9230

drivers/hid/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -176,6 +176,12 @@ config HID_KYE 
	---help---

	Support for Kye/Genius Ergo Mouse.



config HID_UCLOGIC

	tristate "UC-Logic"

	depends on USB_HID

	---help---

	Support for UC-Logic tablets.



config HID_GYRATION

	tristate "Gyration remote control"

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o 
obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o

obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o

obj-$(CONFIG_HID_UCLOGIC)	+= hid-uclogic.o

obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o

obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o

obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o

drivers/hid/hid-apple.c

+4 −3
Original line number Diff line number Diff line
@@ -246,17 +246,18 @@ static int apple_event(struct hid_device *hdev, struct hid_field *field, 
/*

 * MacBook JIS keyboard has wrong logical maximum

 */

static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int rsize)

static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct apple_sc *asc = hid_get_drvdata(hdev);



	if ((asc->quirks & APPLE_RDESC_JIS) && rsize >= 60 &&

	if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 &&

			rdesc[53] == 0x65 && rdesc[59] == 0x65) {

		dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report "

				"descriptor\n");

		rdesc[53] = rdesc[59] = 0xe7;

	}

	return rdesc;

}



static void apple_setup_input(struct input_dev *input)

drivers/hid/hid-cherry.c

+4 −3
Original line number Diff line number Diff line
@@ -26,15 +26,16 @@ 
 * Cherry Cymotion keyboard have an invalid HID report descriptor,

 * that needs fixing before we can parse it.

 */

static void ch_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int rsize)

static __u8 *ch_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {

	if (*rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) {

		dev_info(&hdev->dev, "fixing up Cherry Cymotion report "

				"descriptor\n");

		rdesc[11] = rdesc[16] = 0xff;

		rdesc[12] = rdesc[17] = 0x03;

	}

	return rdesc;

}



#define ch_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \

drivers/hid/hid-core.c

+5 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ int hid_parse_report(struct hid_device *device, __u8 *start, 
	};



	if (device->driver->report_fixup)

		device->driver->report_fixup(device, start, size);

		start = device->driver->report_fixup(device, start, &size);



	device->rdesc = kmemdup(start, size, GFP_KERNEL);

	if (device->rdesc == NULL)
@@ -1395,6 +1395,10 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },