]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Input: synaptics-rmi4 - set the ABS_MT_TOOL_TYPE bit to report tool type
authorAndrew Duggan <aduggan@synaptics.com>
Wed, 9 Nov 2016 01:03:16 +0000 (17:03 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 9 Nov 2016 01:12:09 +0000 (17:12 -0800)
The rmi4 2D sensor functions report the tool type via
input_mt_report_slot_state(), but the abs parameter bit has not been
set so the tool type is not reported to userspace. This patch set
the ABS_MT_TOOL_TYPE bit.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/rmi4/rmi_2d_sensor.c

index e97bd7fabccc5ec3b483070b3d58a55cca12b1f2..07007ff8e29fff7bf0d245a0174b17e8fcbccf29 100644 (file)
@@ -177,10 +177,12 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor)
                                sensor->dmax = DMAX * res_x;
                }
 
-               input_set_abs_params(input, ABS_MT_PRESSURE, 0, 0xff, 0, 0);
-               input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 0x0f, 0, 0);
-               input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 0x0f, 0, 0);
-               input_set_abs_params(input, ABS_MT_ORIENTATION, 0, 1, 0, 0);
+               input_set_abs_params(input, ABS_MT_PRESSURE, 0, 0xff, 0, 0);
+               input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 0x0f, 0, 0);
+               input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 0x0f, 0, 0);
+               input_set_abs_params(input, ABS_MT_ORIENTATION, 0, 1, 0, 0);
+               input_set_abs_params(input, ABS_MT_TOOL_TYPE,
+                                    0, MT_TOOL_MAX, 0, 0);
 
                if (sensor->sensor_type == rmi_sensor_touchpad)
                        input_flags = INPUT_MT_POINTER;