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

Commit 440105d3 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.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
  Input: elan_i2c - add ELAN0608 to the ACPI table
  Input: trackpoint - assume 3 buttons when buttons detection fails
parents 3bc6c906 76988690

drivers/input/mouse/elan_i2c_core.c

+4 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,10 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0100", 0 },

	{ "ELAN0600", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN0608", 0 },

	{ "ELAN0605", 0 },

	{ "ELAN0609", 0 },

	{ "ELAN060B", 0 },

	{ "ELAN1000", 0 },

	{ }

};

drivers/input/mouse/trackpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -380,8 +380,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) 
		return 0;



	if (trackpoint_read(ps2dev, TP_EXT_BTN, &button_info)) {

		psmouse_warn(psmouse, "failed to get extended button data\n");

		button_info = 0;

		psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n");

		button_info = 0x33;

	}



	psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);