From: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Date: Mon, 8 Mar 2021 17:42:08 +0000 (+0100)
Subject: HID: multitouch: set Stylus suffix for Stylus-application devices, too
X-Git-Tag: accepted/tizen/unified/20230118.172025~6952^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc8b796f618c3ccb0a2a8ed1e96c00a1a7849415;p=platform%2Fkernel%2Flinux-rpi.git

HID: multitouch: set Stylus suffix for Stylus-application devices, too

This re-adds the suffix to Win8 stylus-on-touchscreen devices,
now that they aren't erroneously marked as MT

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 55dcb85..eed81bd 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1580,13 +1580,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
 		/* we do not set suffix = "Touchscreen" */
 		hi->input->name = hdev->name;
 		break;
-	case HID_DG_STYLUS:
-		/* force BTN_STYLUS to allow tablet matching in udev */
-		__set_bit(BTN_STYLUS, hi->input->keybit);
-		break;
 	case HID_VD_ASUS_CUSTOM_MEDIA_KEYS:
 		suffix = "Custom Media Keys";
 		break;
+	case HID_DG_STYLUS:
+		/* force BTN_STYLUS to allow tablet matching in udev */
+		__set_bit(BTN_STYLUS, hi->input->keybit);
+		fallthrough;
 	case HID_DG_PEN:
 		suffix = "Stylus";
 		break;