Commit e900deb2 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 fix from Dmitry Torokhov:
 "A small fixup to the Zinitix touchscreen driver to avoid enabling the
  IRQ line before we successfully requested it"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: zinitix - make sure the IRQ is allocated before it gets enabled
parents 95350123 cf73ed89

drivers/input/touchscreen/zinitix.c

+9 −9
Original line number Diff line number Diff line
@@ -488,6 +488,15 @@ static int zinitix_ts_probe(struct i2c_client *client) 
		return error;

	}



	error = devm_request_threaded_irq(&client->dev, client->irq,

					  NULL, zinitix_ts_irq_handler,

					  IRQF_ONESHOT | IRQF_NO_AUTOEN,

					  client->name, bt541);

	if (error) {

		dev_err(&client->dev, "Failed to request IRQ: %d\n", error);

		return error;

	}



	error = zinitix_init_input_dev(bt541);

	if (error) {

		dev_err(&client->dev,
@@ -513,15 +522,6 @@ static int zinitix_ts_probe(struct i2c_client *client) 
		return -EINVAL;

	}



	error = devm_request_threaded_irq(&client->dev, client->irq,

					  NULL, zinitix_ts_irq_handler,

					  IRQF_ONESHOT | IRQF_NO_AUTOEN,

					  client->name, bt541);

	if (error) {

		dev_err(&client->dev, "Failed to request IRQ: %d\n", error);

		return error;

	}



	return 0;

}