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

Commit 978ab6a0 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 layer fixes from Dmitry Torokhov:
 "Fixes for two recent regressions (in Synaptics PS/2 and uinput
  drivers) and some more driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: synaptics - fix handling of disabling gesture mode"
  Input: psmouse - fix data race in __ps2_command
  Input: elan_i2c - add all valid ic type for i2c/smbus
  Input: zhenhua - ensure we have BITREVERSE
  Input: omap4-keypad - fix memory leak
  Input: serio - fix blocking of parport
  Input: uinput - fix crash when using ABS events
  Input: elan_i2c - expand maximum product_id form 0xFF to 0xFFFF
  Input: elan_i2c - add ic type 0x03
  Input: elan_i2c - don't require known iap version
  Input: imx6ul_tsc - fix controller name
  Input: imx6ul_tsc - use the preferred method for kzalloc()
  Input: imx6ul_tsc - check for negative return value
  Input: imx6ul_tsc - propagate the errors
  Input: walkera0701 - fix abs() calculations on 64 bit values
  Input: mms114 - remove unneded semicolons
  Input: pm8941-pwrkey - remove unneded semicolon
  Input: fix typo in MT documentation
  Input: cyapa - fix address of Gen3 devices in device tree documentation
parents 5634347d 62d78461

Documentation/devicetree/bindings/input/cypress,cyapa.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example: 
		/* Cypress Gen3 touchpad */

		touchpad@67 {

			compatible = "cypress,cyapa";

			reg = <0x24>;

			reg = <0x67>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

Documentation/input/multi-touch-protocol.txt

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ For win8 devices with both T and C coordinates, the position mapping is 
   ABS_MT_POSITION_X := T_X

   ABS_MT_POSITION_Y := T_Y

   ABS_MT_TOOL_X := C_X

   ABS_MT_TOOL_X := C_Y

   ABS_MT_TOOL_Y := C_Y



Unfortunately, there is not enough information to specify both the touching

ellipse and the tool ellipse, so one has to resort to approximations.  One

drivers/input/joystick/walkera0701.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void walkera0701_irq_handler(void *handler_data) 
		if (w->counter == 24) {	/* full frame */

			walkera0701_parse_frame(w);

			w->counter = NO_SYNC;

			if (abs(pulse_time - SYNC_PULSE) < RESERVE)	/* new frame sync */

			if (abs64(pulse_time - SYNC_PULSE) < RESERVE)	/* new frame sync */

				w->counter = 0;

		} else {

			if ((pulse_time > (ANALOG_MIN_PULSE - RESERVE)
@@ -161,7 +161,7 @@ static void walkera0701_irq_handler(void *handler_data) 
			} else

				w->counter = NO_SYNC;

		}

	} else if (abs(pulse_time - SYNC_PULSE - BIN0_PULSE) <

	} else if (abs64(pulse_time - SYNC_PULSE - BIN0_PULSE) <

				RESERVE + BIN1_PULSE - BIN0_PULSE)	/* frame sync .. */

		w->counter = 0;

drivers/input/keyboard/omap4-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int omap4_keypad_probe(struct platform_device *pdev) 


	error = omap4_keypad_parse_dt(&pdev->dev, keypad_data);

	if (error)

		return error;

		goto err_free_keypad;



	res = request_mem_region(res->start, resource_size(res), pdev->name);

	if (!res) {

drivers/input/misc/pm8941-pwrkey.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int pm8941_reboot_notify(struct notifier_block *nb, 
	default:

		reset_type = PON_PS_HOLD_TYPE_HARD_RESET;

		break;

	};

	}



	error = regmap_update_bits(pwrkey->regmap,

				   pwrkey->baseaddr + PON_PS_HOLD_RST_CTL,