diff options
| author | Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> | 2021-03-08 18:42:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-18 09:58:58 +0200 |
| commit | 41b9b39e1b3798b801adbcaff1aea2d5ae2ccb3f (patch) | |
| tree | ae71f30aca753404847a8b425a4c4fbbd31d6dc0 | |
| parent | 2173746ed1256184a84e3e32e4d0be8f4275620d (diff) | |
| download | linux-stable-41b9b39e1b3798b801adbcaff1aea2d5ae2ccb3f.tar.gz linux-stable-41b9b39e1b3798b801adbcaff1aea2d5ae2ccb3f.tar.bz2 linux-stable-41b9b39e1b3798b801adbcaff1aea2d5ae2ccb3f.zip | |
HID: multitouch: set Stylus suffix for Stylus-application devices, too
[ Upstream commit bc8b796f618c3ccb0a2a8ed1e96c00a1a7849415 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index f290ba856323..37270b8f4e58 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1587,13 +1587,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; |