Skip to content

Commit e900deb

Browse files
committed
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
2 parents 9535012 + cf73ed8 commit e900deb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

drivers/input/touchscreen/zinitix.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,15 @@ static int zinitix_ts_probe(struct i2c_client *client)
488488
return error;
489489
}
490490

491+
error = devm_request_threaded_irq(&client->dev, client->irq,
492+
NULL, zinitix_ts_irq_handler,
493+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
494+
client->name, bt541);
495+
if (error) {
496+
dev_err(&client->dev, "Failed to request IRQ: %d\n", error);
497+
return error;
498+
}
499+
491500
error = zinitix_init_input_dev(bt541);
492501
if (error) {
493502
dev_err(&client->dev,
@@ -513,15 +522,6 @@ static int zinitix_ts_probe(struct i2c_client *client)
513522
return -EINVAL;
514523
}
515524

516-
error = devm_request_threaded_irq(&client->dev, client->irq,
517-
NULL, zinitix_ts_irq_handler,
518-
IRQF_ONESHOT | IRQF_NO_AUTOEN,
519-
client->name, bt541);
520-
if (error) {
521-
dev_err(&client->dev, "Failed to request IRQ: %d\n", error);
522-
return error;
523-
}
524-
525525
return 0;
526526
}
527527

0 commit comments

Comments
 (0)