Merge branch 'for-4.16/elo' into for-linus

Pull hid-elo device detection fix
josf · Jan 31, 2018 · a44f3ec · a44f3ec
2 parents 7908449 + 9abd04a
commit a44f3ec
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
@@ -42,6 +42,12 @@ static int elo_input_configured(struct hid_device *hdev,
 {
 	struct input_dev *input = hidinput->input;
 
+	/*
+	 * ELO devices have one Button usage in GenDesk field, which makes
+	 * hid-input map it to BTN_LEFT; that confuses userspace, which then
+	 * considers the device to be a mouse/touchpad instead of touchscreen.
+	 */
+	clear_bit(BTN_LEFT, input->keybit);
 	set_bit(BTN_TOUCH, input->keybit);
 	set_bit(ABS_PRESSURE, input->absbit);
 	input_set_abs_params(input, ABS_PRESSURE, 0, 256, 0, 0);