summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/stmfts.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-23 14:24:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-23 14:24:37 +0200
commit0520d37bb3d49f8e62e30c80b001e0003b3f3ca9 (patch)
treedecc3a87d59b4eec5ec8c8c9c3f8378c35a29c7b /drivers/input/touchscreen/stmfts.c
parentUSB: Force disconnect Huawei 4G modem during suspend (diff)
parentLinux 4.14-rc6 (diff)
downloadlinux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.tar.xz
linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.zip
Merge 4.14-rc6 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/touchscreen/stmfts.c')
-rw-r--r--drivers/input/touchscreen/stmfts.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index 157fdb4bb2e8..8c6c6178ec12 100644
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -663,12 +663,10 @@ static int stmfts_probe(struct i2c_client *client,
sdata->input->open = stmfts_input_open;
sdata->input->close = stmfts_input_close;
+ input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_X);
+ input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_Y);
touchscreen_parse_properties(sdata->input, true, &sdata->prop);
- input_set_abs_params(sdata->input, ABS_MT_POSITION_X, 0,
- sdata->prop.max_x, 0, 0);
- input_set_abs_params(sdata->input, ABS_MT_POSITION_Y, 0,
- sdata->prop.max_y, 0, 0);
input_set_abs_params(sdata->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
input_set_abs_params(sdata->input, ABS_MT_TOUCH_MINOR, 0, 255, 0, 0);
input_set_abs_params(sdata->input, ABS_MT_ORIENTATION, 0, 255, 0, 0);