All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Ahelenia Ziemiańska" <nabijaczleweli@nabijaczleweli.xyz>,
	"Jiri Kosina" <jkosina@suse.cz>,
	"Sasha Levin" <sashal@kernel.org>,
	linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 07/39] HID: multitouch: set Stylus suffix for Stylus-application devices, too
Date: Mon,  7 Jun 2021 12:12:46 -0400	[thread overview]
Message-ID: <20210607161318.3583636-7-sashal@kernel.org> (raw)
In-Reply-To: <20210607161318.3583636-1-sashal@kernel.org>

From: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>

[ 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>
---
 drivers/hid/hid-multitouch.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 8429ebe7097e..d298541e64b2 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1576,13 +1576,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;
-- 
2.30.2


  parent reply	other threads:[~2021-06-07 16:16 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-07 16:12 [PATCH AUTOSEL 5.10 01/39] net: ieee802154: fix null deref in parse dev addr Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 02/39] HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 03/39] HID: a4tech: use A4_2WHEEL_MOUSE_HACK_B8 for A4TECH NB-95 Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 04/39] HID: hid-input: add mapping for emoji picker key Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 05/39] HID: hid-sensor-hub: Return error for hid_set_field() failure Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 06/39] HID: quirks: Add quirk for Lenovo optical mouse Sasha Levin
2021-06-07 16:12 ` Sasha Levin [this message]
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 08/39] HID: Add BUS_VIRTUAL to hid_connect logging Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 09/39] HID: usbhid: fix info leak in hid_submit_ctrl Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 10/39] drm/tegra: sor: Do not leak runtime PM reference Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 11/39] gpu: host1x: Split up client initalization and registration Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 12/39] drm/tegra: sor: Fully initialize SOR before registration Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 13/39] ARM: OMAP1: Fix use of possibly uninitialized irq variable Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 14/39] ARM: OMAP2+: Fix build warning when mmc_omap is not built Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 15/39] gfs2: Prevent direct-I/O write fallback errors from getting lost Sasha Levin
2021-06-07 16:12   ` [Cluster-devel] " Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 16/39] gfs2: fix a deadlock on withdraw-during-mount Sasha Levin
2021-06-07 16:12   ` [Cluster-devel] " Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 17/39] HID: gt683r: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 18/39] riscv: Use -mno-relax when using lld linker Sasha Levin
2021-06-07 16:12   ` Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 19/39] gfs2: Fix use-after-free in gfs2_glock_shrink_scan Sasha Levin
2021-06-07 16:12   ` [Cluster-devel] " Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.10 20/39] Bluetooth: use correct lock to prevent UAF of hdev object Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 21/39] scsi: target: core: Fix warning on realtime kernels Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 22/39] ethernet: myri10ge: Fix missing error code in myri10ge_probe() Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 23/39] scsi: qedf: Do not put host in qedf_vport_create() unconditionally Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 24/39] Bluetooth: Add a new USB ID for RTL8822CE Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 25/39] scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 26/39] nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 27/39] nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 28/39] nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 29/39] nvme-loop: do not warn for deleted controllers during reset Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 30/39] net: ipconfig: Don't override command-line hostnames or domains Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 31/39] drm/amd/display: Allow bandwidth validation for 0 streams Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 32/39] drm/amdgpu: refine amdgpu_fru_get_product_info Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 33/39] drm/amd/display: Fix overlay validation by considering cursors Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 34/39] drm/amd/display: Fix potential memory leak in DMUB hw_init Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 35/39] drm/amd/amdgpu:save psp ring wptr to avoid attack Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13   ` Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 36/39] rtnetlink: Fix missing error code in rtnl_bridge_notify() Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 37/39] net/x25: Return the correct errno code Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 38/39] net: " Sasha Levin
2021-06-07 16:13 ` [PATCH AUTOSEL 5.10 39/39] fib: " Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210607161318.3583636-7-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nabijaczleweli@nabijaczleweli.xyz \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.