Message ID | 1476373872-18027-7-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Thu, Oct 13, 2016 at 05:51:00PM +0200, Benjamin Tissoires wrote: > From: Andrew Duggan <aduggan@synaptics.com> > > 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> Applied, thank you. > > --- > > new in v3 > --- > drivers/input/rmi4/rmi_2d_sensor.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c > index e97bd7f..0747890 100644 > --- a/drivers/input/rmi4/rmi_2d_sensor.c > +++ b/drivers/input/rmi4/rmi_2d_sensor.c > @@ -181,6 +181,8 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor) > 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; > -- > 2.7.4 >
diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c index e97bd7f..0747890 100644 --- a/drivers/input/rmi4/rmi_2d_sensor.c +++ b/drivers/input/rmi4/rmi_2d_sensor.c @@ -181,6 +181,8 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor) 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;