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

Commit bb762929 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:
 "Just a 2 small driver fixups here"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - fix a typo for Cintiq 22HDT
  Input: synaptics - fix sync lost after resume on some laptops
parents 8b35c359 3bd1f7e2

drivers/input/mouse/synaptics.c

+2 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,7 @@ static int synaptics_reconnect(struct psmouse *psmouse) 
{

	struct synaptics_data *priv = psmouse->private;

	struct synaptics_data old_priv = *priv;

	unsigned char param[2];

	int retry = 0;

	int error;
@@ -1394,6 +1395,7 @@ static int synaptics_reconnect(struct psmouse *psmouse) 
			 */

			ssleep(1);

		}

		ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETID);

		error = synaptics_detect(psmouse, 0);

	} while (error && ++retry < 3);

drivers/input/tablet/wacom_wac.c

+5 −3
Original line number Diff line number Diff line
@@ -1966,7 +1966,8 @@ static const struct wacom_features wacom_features_0xF4 = 
	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

static const struct wacom_features wacom_features_0xF8 =

	{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS,   104480, 65600, 2047, /* Pen */

	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };

	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };

static const struct wacom_features wacom_features_0xF6 =

	{ "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10 };
@@ -2009,7 +2010,8 @@ static const struct wacom_features wacom_features_0xFA = 
	  63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

static const struct wacom_features wacom_features_0x5B =

	{ "Wacom Cintiq 22HDT", WACOM_PKGLEN_INTUOS,      95840, 54260, 2047,

	  63, WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };

	  63, WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };

static const struct wacom_features wacom_features_0x5E =

	{ "Wacom Cintiq 22HDT", .type = WACOM_24HDT,

	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5b, .touch_max = 10 };