diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-09-19 23:47:29 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-19 23:48:16 +0200 |
| commit | 1ad346a9f8ca0d266ddbfdbbbd8913782b417f35 (patch) | |
| tree | e7d1c7bb3af558c434b4545a4cff744f09a0f227 /drivers/input/touchscreen/edt-ft5x06.c | |
| parent | 5b6e7f1c169db10632459c28f148011e039187bd (diff) | |
| parent | 51c80b74002f86477d691ed7c8ac479dcfa6271c (diff) | |
Merge branch 'for-next' of git://github.com/rydberg/linux into from-henrik
Pull Input and HID updates for 3.7 from Henrik Rydberg:
"The tree contains input core changes, Acked by Dmitry, which substantially
reduces the irqsoff latency for all input devices. It also contains MT changes
which allows further memory reduction, speedup and hardware support in the HID
Multitouch driver. Lastly, you get the conversion of the bcm5974 driver to
MT-B, which due to the mixed dependency of the tree fits better here than
anywhere else."
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/input/touchscreen/edt-ft5x06.c')
| -rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 9afc777a40a..7b786e757ba 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -778,7 +778,7 @@ static int __devinit edt_ft5x06_ts_probe(struct i2c_client *client, 0, tsdata->num_x * 64 - 1, 0, 0); input_set_abs_params(input, ABS_MT_POSITION_Y, 0, tsdata->num_y * 64 - 1, 0, 0); - error = input_mt_init_slots(input, MAX_SUPPORT_POINTS); + error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0); if (error) { dev_err(&client->dev, "Unable to init MT slots.\n"); goto err_free_mem; |