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

Commit 1b74a868 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:
 "Two fixes for regressions in Wacom driver and fixes for drivers using
  threaded IRQ framework without specifying IRQF_ONESHOT."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: request threaded-only IRQs with IRQF_ONESHOT
  Input: wacom - don't retrieve touch_max when it is predefined
  Input: wacom - fix retrieving touch_max bug
  Input: fix input.h kernel-doc warning
parents c4aed353 9b7e31bb

drivers/input/joystick/as5011.c

+3 −2
Original line number Diff line number Diff line
@@ -282,7 +282,8 @@ static int __devinit as5011_probe(struct i2c_client *client, 


	error = request_threaded_irq(as5011->button_irq,

				     NULL, as5011_button_interrupt,

				     IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				     IRQF_TRIGGER_RISING |

					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				     "as5011_button", as5011);

	if (error < 0) {

		dev_err(&client->dev,
@@ -296,7 +297,7 @@ static int __devinit as5011_probe(struct i2c_client *client, 


	error = request_threaded_irq(as5011->axis_irq, NULL,

				     as5011_axis_interrupt,

				     plat_data->axis_irqflags,

				     plat_data->axis_irqflags | IRQF_ONESHOT,

				     "as5011_joystick", as5011);

	if (error) {

		dev_err(&client->dev,

drivers/input/keyboard/mcs_touchkey.c

+2 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ static int __devinit mcs_touchkey_probe(struct i2c_client *client, 
	}



	error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,

			IRQF_TRIGGER_FALLING, client->dev.driver->name, data);

				     IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				     client->dev.driver->name, data);

	if (error) {

		dev_err(&client->dev, "Failed to register interrupt\n");

		goto err_free_mem;

drivers/input/keyboard/mpr121_touchkey.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int __devinit mpr_touchkey_probe(struct i2c_client *client, 


	error = request_threaded_irq(client->irq, NULL,

				     mpr_touchkey_interrupt,

				     IRQF_TRIGGER_FALLING,

				     IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				     client->dev.driver->name, mpr121);

	if (error) {

		dev_err(&client->dev, "Failed to register interrupt\n");

drivers/input/keyboard/qt1070.c

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ static int __devinit qt1070_probe(struct i2c_client *client, 
	msleep(QT1070_RESET_TIME);



	err = request_threaded_irq(client->irq, NULL, qt1070_interrupt,

		IRQF_TRIGGER_NONE, client->dev.driver->name, data);

				   IRQF_TRIGGER_NONE | IRQF_ONESHOT,

				   client->dev.driver->name, data);

	if (err) {

		dev_err(&client->dev, "fail to request irq\n");

		goto err_free_mem;

drivers/input/keyboard/tca6416-keypad.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static int __devinit tca6416_keypad_probe(struct i2c_client *client, 


		error = request_threaded_irq(chip->irqnum, NULL,

					     tca6416_keys_isr,

					     IRQF_TRIGGER_FALLING,

					     IRQF_TRIGGER_FALLING |

						IRQF_ONESHOT,

					     "tca6416-keypad", chip);

		if (error) {

			dev_dbg(&client->dev,