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

Commit 9f935675 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 updates from Dmitry Torokhov:
 "A bunch of fixes for minor defects reported by Coverity, a few driver
  fixups and revert of i8042.nomux change so that we are once again
  enable active MUX mode if box claims to support it"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: i8042 - disable active multiplexing by default"
  Input: altera_ps2 - use correct type for irq return value
  Input: altera_ps2 - write to correct register when disabling interrupts
  Input: max77693-haptic - fix potential overflow
  Input: psmouse - remove unneeded check in psmouse_reconnect()
  Input: vsxxxaa - fix code dropping bytes from queue
  Input: ims-pcu - fix dead code in ims_pcu_ofn_reg_addr_store()
  Input: opencores-kbd - fix error handling
  Input: wm97xx - adapt parameters to tosa touchscreen.
  Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544
  Input: stmpe-keypad - fix valid key line bitmask
  Input: soc_button_array - update calls to gpiod_get*()
parents ab01f963 e55a3366

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	i8042.noloop	[HW] Disable the AUX Loopback command while probing

			     for the AUX port

	i8042.nomux	[HW] Don't check presence of an active multiplexing

			     controller. Default: true.

			     controller

	i8042.nopnp	[HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX

			     controllers

	i8042.notimeout	[HW] Ignore timeout condition signalled by controller

drivers/input/keyboard/opencores-kbd.c

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


	opencores_kbd->addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(opencores_kbd->addr))

		error = PTR_ERR(opencores_kbd->addr);

		return PTR_ERR(opencores_kbd->addr);



	input->name = pdev->name;

	input->phys = "opencores-kbd/input0";

drivers/input/keyboard/stmpe-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { 
		.max_cols		= 8,

		.max_rows		= 12,

		.col_gpios		= 0x0000ff,	/* GPIO 0 - 7*/

		.row_gpios		= 0x1fef00,	/* GPIO 8-14, 16-20 */

		.row_gpios		= 0x1f7f00,	/* GPIO 8-14, 16-20 */

	},

	[STMPE2403] = {

		.auto_increment		= true,

drivers/input/misc/ims-pcu.c

+1 −1
Original line number Diff line number Diff line
@@ -1381,7 +1381,7 @@ static ssize_t ims_pcu_ofn_reg_addr_store(struct device *dev, 
	pcu->ofn_reg_addr = value;

	mutex_unlock(&pcu->cmd_mutex);



	return error ?: count;

	return count;

}



static DEVICE_ATTR(reg_addr, S_IRUGO | S_IWUSR,

drivers/input/misc/max77693-haptic.c

+2 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int max77693_haptic_play_effect(struct input_dev *dev, void *data, 
				       struct ff_effect *effect)

{

	struct max77693_haptic *haptic = input_get_drvdata(dev);

	uint64_t period_mag_multi;

	u64 period_mag_multi;



	haptic->magnitude = effect->u.rumble.strong_magnitude;

	if (!haptic->magnitude)
@@ -205,8 +205,7 @@ static int max77693_haptic_play_effect(struct input_dev *dev, void *data, 
	 * The formula to convert magnitude to pwm_duty as follows:

	 * - pwm_duty = (magnitude * pwm_period) / MAX_MAGNITUDE(0xFFFF)

	 */

	period_mag_multi = (int64_t)(haptic->pwm_dev->period *

						haptic->magnitude);

	period_mag_multi = (u64)haptic->pwm_dev->period * haptic->magnitude;

	haptic->pwm_duty = (unsigned int)(period_mag_multi >>

						MAX_MAGNITUDE_SHIFT);