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

Commit 319645ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:
 "Two functional fixes for wacom HID driver from Ping Cheng and Jiri
  Kosina"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: fixup quirks setup for WACOM_DEVICETYPE_PAD
  HID: wacom: Add outbounding area for DTU1141
parents 1282ac40 a3088abc

drivers/hid/wacom_wac.c

+3 −2
Original line number Diff line number Diff line
@@ -2481,7 +2481,7 @@ void wacom_setup_device_quirks(struct wacom *wacom) 
		if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {

			if (features->touch_max)

				features->device_type |= WACOM_DEVICETYPE_TOUCH;

			if (features->type >= INTUOSHT || features->type <= BAMBOO_PT)

			if (features->type >= INTUOSHT && features->type <= BAMBOO_PT)

				features->device_type |= WACOM_DEVICETYPE_PAD;



			features->x_max = 4096;
@@ -3213,7 +3213,8 @@ static const struct wacom_features wacom_features_0x32F = 
	  WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };

static const struct wacom_features wacom_features_0x336 =

	{ "Wacom DTU1141", 23472, 13203, 1023, 0,

	  DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4 };

	  DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4,

	  WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };

static const struct wacom_features wacom_features_0x57 =

	{ "Wacom DTK2241", 95640, 54060, 2047, 63,

	  DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 6,