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

Commit f29b909d 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 subsystem updates from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - cleanup Focaltech code
  Input: i8042 - add XMG C504 to keyboard reset table
parents 03daa36f 324ae095

drivers/input/mouse/focaltech.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int focaltech_detect(struct psmouse *psmouse, bool set_properties) 


	if (set_properties) {

		psmouse->vendor = "FocalTech";

		psmouse->name = "FocalTech Touchpad";

		psmouse->name = "Touchpad";

	}



	return 0;
@@ -146,8 +146,8 @@ static void focaltech_report_state(struct psmouse *psmouse) 
	}

	input_mt_report_pointer_emulation(dev, true);



	input_report_key(psmouse->dev, BTN_LEFT, state->pressed);

	input_sync(psmouse->dev);

	input_report_key(dev, BTN_LEFT, state->pressed);

	input_sync(dev);

}



static void focaltech_process_touch_packet(struct psmouse *psmouse,

drivers/input/serio/i8042-x86ia64io.h

+7 −0
Original line number Diff line number Diff line
@@ -877,6 +877,13 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "P34"),

		},

	},

	{

		/* Schenker XMG C504 - Elantech touchpad */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "XMG"),

			DMI_MATCH(DMI_PRODUCT_NAME, "C504"),

		},

	},

	{ }

};