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

Commit e93df634 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 fixes from Dmitry Torokhov:
 "Miscellaneous driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - disable "palm detection" in the focaltech driver
  Input: psmouse - disable changing resolution/rate/scale for FocalTech
  Input: psmouse - ensure that focaltech reports consistent coordinates
  Input: psmouse - remove hardcoded touchpad size from the focaltech driver
  Input: tc3589x-keypad - set IRQF_ONESHOT flag to ensure IRQ request
  Input: ALPS - fix memory leak when detection fails
  Input: sun4i-ts - add thermal driver dependency
  Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()
  Input: cyapa - fix unaligned functions redefinition error
  Input: mma8450 - add parent device
parents 068c65c5 4eb8d6e7

drivers/input/keyboard/tc3589x-keypad.c

+3 −3
Original line number Diff line number Diff line
@@ -411,8 +411,8 @@ static int tc3589x_keypad_probe(struct platform_device *pdev) 


	input_set_drvdata(input, keypad);



	error = request_threaded_irq(irq, NULL,

			tc3589x_keypad_irq, plat->irqtype,

	error = request_threaded_irq(irq, NULL, tc3589x_keypad_irq,

				     plat->irqtype | IRQF_ONESHOT,

				     "tc3589x-keypad", keypad);

	if (error < 0) {

		dev_err(&pdev->dev,

drivers/input/misc/mma8450.c

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static int mma8450_probe(struct i2c_client *c, 
	idev->private		= m;

	idev->input->name	= MMA8450_DRV_NAME;

	idev->input->id.bustype	= BUS_I2C;

	idev->input->dev.parent = &c->dev;

	idev->poll		= mma8450_poll;

	idev->poll_interval	= POLL_INTERVAL;

	idev->poll_interval_max	= POLL_INTERVAL_MAX;

drivers/input/mouse/alps.c

+3 −1
Original line number Diff line number Diff line
@@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse *psmouse, bool set_properties) 
		return -ENOMEM;



	error = alps_identify(psmouse, priv);

	if (error)

	if (error) {

		kfree(priv);

		return error;

	}



	if (set_properties) {

		psmouse->vendor = "ALPS";

drivers/input/mouse/cyapa_gen3.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/input/mt.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/unaligned/access_ok.h>

#include <asm/unaligned.h>

#include "cyapa.h"

drivers/input/mouse/cyapa_gen5.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/mutex.h>

#include <linux/completion.h>

#include <linux/slab.h>

#include <linux/unaligned/access_ok.h>

#include <asm/unaligned.h>

#include <linux/crc-itu-t.h>

#include "cyapa.h"
@@ -1926,7 +1926,7 @@ static int cyapa_gen5_read_idac_data(struct cyapa *cyapa, 
				electrodes_tx = cyapa->electrodes_x;

			max_element_cnt = ((cyapa->aligned_electrodes_rx + 7) &

						~7u) * electrodes_tx;

		} else if (idac_data_type == GEN5_RETRIEVE_SELF_CAP_PWC_DATA) {

		} else {

			offset = 2;

			max_element_cnt = cyapa->electrodes_x +

						cyapa->electrodes_y;