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

Commit 8665ffc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "Two small fixups to the Wacom driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - correct reported resolution for Intuos4 Wireless
  Input: wacom - fix "can not retrieve extra class descriptor" for 24HDT
parents b4cbb197 202dec86

drivers/input/tablet/wacom_wac.c

+2 −2
Original line number Diff line number Diff line
@@ -1912,7 +1912,7 @@ static const struct wacom_features wacom_features_0xBB = 
	{ "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047,

	  63, INTUOS4L, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

static const struct wacom_features wacom_features_0xBC =

	{ "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40840, 25400, 2047,

	{ "Wacom Intuos4 WL",     WACOM_PKGLEN_INTUOS,    40640, 25400, 2047,

	  63, INTUOS4, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

static const struct wacom_features wacom_features_0x26 =

	{ "Wacom Intuos5 touch S", WACOM_PKGLEN_INTUOS,  31496, 19685, 2047,
@@ -2209,7 +2209,7 @@ const struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE_WACOM(0x47) },

	{ USB_DEVICE_WACOM(0xF4) },

	{ USB_DEVICE_WACOM(0xF8) },

	{ USB_DEVICE_WACOM(0xF6) },

	{ USB_DEVICE_DETAILED(0xF6, USB_CLASS_HID, 0, 0) },

	{ USB_DEVICE_WACOM(0xFA) },

	{ USB_DEVICE_LENOVO(0x6004) },

	{ }