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

Commit 484d41c8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: atmel_mxt_ts: Re-parse IRQ to ensure correct mapping"

parents 6258390c ba8f8732

drivers/input/touchscreen/atmel_mxt_ts.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/string.h>

#include <linux/string.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>





#if defined(CONFIG_FB)

#if defined(CONFIG_FB)

#include <linux/notifier.h>

#include <linux/notifier.h>
@@ -3181,6 +3182,10 @@ static int mxt_probe(struct i2c_client *client, 
	if (error)

	if (error)

		goto err_irq_gpio_req;

		goto err_irq_gpio_req;





	error = irq_of_parse_and_map(client->dev.of_node, 0);

	if (!error)

		goto err_irq_gpio_req;



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

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

			pdata->irqflags | IRQF_ONESHOT,

			pdata->irqflags | IRQF_ONESHOT,

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

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