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

Commit f1275410 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'waltop' into for-linus

parents 8b66a16f 00e7f964

drivers/hid/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ config HID_UCLOGIC 
	---help---

	Support for UC-Logic tablets.



config HID_WALTOP

	tristate "Waltop"

	depends on USB_HID

	---help---

	Support for Waltop 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
@@ -69,6 +69,7 @@ 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

obj-$(CONFIG_HID_WALTOP)	+= hid-waltop.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

drivers/hid/hid-core.c

+4 −6
Original line number Diff line number Diff line
@@ -388,12 +388,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) 
	__u32 data;

	unsigned n;



	/* Local delimiter could have value 0, which allows size to be 0 */

	if (item->size == 0 && item->tag != HID_LOCAL_ITEM_TAG_DELIMITER) {

		dbg_hid("item data expected for local item\n");

		return -1;

	}



	data = item_udata(item);



	switch (item->tag) {
@@ -1401,6 +1395,10 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },

drivers/hid/hid-ids.h

+6 −0
Original line number Diff line number Diff line
@@ -542,6 +542,12 @@ 
#define USB_VENDOR_ID_WACOM		0x056a

#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81



#define USB_VENDOR_ID_WALTOP				0x172f

#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH	0x0032

#define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH	0x0034

#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH	0x0501

#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH	0x0500



#define USB_VENDOR_ID_WISEGROUP		0x0925

#define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005

#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101