From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 7 Jul 2012 23:18:33 +0000 (-0700)
Subject: Pull input changes from Henrik Rydberg, including large update to
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f053ea8d841a3a4620fff4a1b2ab1da9d7c53939;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Pull input changes from Henrik Rydberg, including large update to
atmel_mxt_ts driver by Daniel and MT protocol addition for win8 devices.

Conflicts:
	drivers/input/touchscreen/atmel_mxt_ts.c
---

f053ea8d841a3a4620fff4a1b2ab1da9d7c53939
diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
index 25fd0561a17d,3ad942ca8725..4623cc69fc60
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@@ -1144,13 -1167,8 +1167,9 @@@ static int __devinit mxt_probe(struct i
  	input_set_drvdata(input_dev, data);
  	i2c_set_clientdata(client, data);
  
- 	error = mxt_initialize(data);
- 	if (error)
- 		goto err_free_object;
- 
  	error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
 -			pdata->irqflags, client->name, data);
 +				     pdata->irqflags | IRQF_ONESHOT,
- 				     client->dev.driver->name, data);
++				     client->name, data);
  	if (error) {
  		dev_err(&client->dev, "Failed to register interrupt\n");
  		goto err_free_object;