Commit 643e69af 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:

 - a fix for cm109 stomping on its own control URB if it tries to toggle
   buzzer immediately after userspace opens input device (found by
   syzcaller)

 - another fix for Raydium touchscreens that do not like splitting
   command transfers

 - quirks for i8042, soc_button_array, and goodix drivers to make them
   work better with certain hardware.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: goodix - add upside-down quirk for Teclast X98 Pro tablet
  Input: cm109 - do not stomp on control URB
  Input: i8042 - add Acer laptops to the i8042 reset list
  Input: cros_ec_keyb - send 'scancodes' in addition to key events
  Input: soc_button_array - add Lenovo Yoga Tablet2 1051L to the dmi_use_low_level_irq list
  Input: raydium_ts_i2c - do not split tx transactions
parents 7f376f19 cffdd6d9

drivers/input/keyboard/cros_ec_keyb.c

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev, 
					"changed: [r%d c%d]: byte %02x\n",

					row, col, new_state);



				input_event(idev, EV_MSC, MSC_SCAN, pos);

				input_report_key(idev, keycodes[pos],

						 new_state);

			}

drivers/input/misc/cm109.c

+5 −2
Original line number Diff line number Diff line
@@ -568,12 +568,15 @@ static int cm109_input_open(struct input_dev *idev) 
	dev->ctl_data->byte[HID_OR2] = dev->keybit;

	dev->ctl_data->byte[HID_OR3] = 0x00;



	dev->ctl_urb_pending = 1;

	error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);

	if (error)

	if (error) {

		dev->ctl_urb_pending = 0;

		dev_err(&dev->intf->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",

			__func__, error);

	else

	} else {

		dev->open = 1;

	}



	mutex_unlock(&dev->pm_mutex);

drivers/input/misc/soc_button_array.c

+11 −0
Original line number Diff line number Diff line
@@ -83,6 +83,17 @@ static const struct dmi_system_id dmi_use_low_level_irq[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "One S1003"),

		},

	},

	{

		/*

		 * Lenovo Yoga Tab2 1051L, something messes with the home-button

		 * IRQ settings, leading to a non working home-button.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "60073"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "1051L"),

		},

	},

	{} /* Terminating entry */

};

drivers/input/serio/i8042-x86ia64io.h

+42 −0
Original line number Diff line number Diff line
@@ -611,6 +611,48 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"),

		},

	},

	{

		/* Advent 4211 */

		.matches = {

drivers/input/touchscreen/goodix.c

+12 −0
Original line number Diff line number Diff line
@@ -192,6 +192,18 @@ static const struct dmi_system_id rotated_screen[] = { 
			DMI_MATCH(DMI_BIOS_DATE, "12/19/2014"),

		},

	},

	{

		.ident = "Teclast X98 Pro",

		.matches = {

			/*

			 * Only match BIOS date, because the manufacturers

			 * BIOS does not report the board name at all

			 * (sometimes)...

			 */

			DMI_MATCH(DMI_BOARD_VENDOR, "TECLAST"),

			DMI_MATCH(DMI_BIOS_DATE, "10/28/2015"),

		},

	},

	{

		.ident = "WinBook TW100",

		.matches = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE