Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp879548pxj; Wed, 16 Jun 2021 16:08:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1cSZTvmegWRBs4p21JDLfZGEpdrCmObvOaOC7RAlbRpBDkXOsiEhw7qssLDeWDj+GhvaH X-Received: by 2002:a5d:8b8b:: with SMTP id p11mr1351710iol.77.1623884909206; Wed, 16 Jun 2021 16:08:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623884909; cv=none; d=google.com; s=arc-20160816; b=NvzChs1SCQScu4q8B6LnFQN1s+IL+yqN66GL1PZ6ATk56+w5frw4VTce5Skdd2NM07 rnTmEbHmZi0vUW9D/C1I5pjPIFkF+Zz8p8EU3i9kthWQNJKALd7Xc300GlR3K1RBA1ON 9TfQRoTULVdKnhYE1Zgj/dFQDJa+8ZfScwpB93GsDOFxIZq0Rz/KNjU5TAwWjmiIMvl1 lO80+08tVXTKxuv9vxNN/XgRfTOXByfFgdez7/G36UtQwdfDM9d2JpP45YA7wxubgdHk /jK01LVHtHHu3uyGbXkB91E4jSb26OQLImlpOHWbuw0KGT1KJ2/e+t4ULgaK118w6wkA zOnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xw9TsRoKhqc+9jQ9a+TodM7ntcrlZAu28CQ3Nisr7ns=; b=kZM5rZ4ZJGxUt6L0rOrWJ5I4k9vfS4Oyqlii/UqvCClMeHTsxm6Gzy4pDpoe51EW1N Ob9CiYEkgzY3/ed/CLDlQG98aOlOUSNlv8/1jKNAibQ83x7oikgqWtBN4rGbEBFExDvr 9UMCIDRSDx6ExGx6I6EfLrkoYbo2oUuTJyVO5UXOuQdKfO/mkwTbDVs+OTCuKVtrCYGC y9wrIEWw6brp7Jwlub/WEc6RBR9zjqJjJbJLHdbTYRxrphCJGsCYt+K7Fd5qmVjEn61T xliErWVm8EcK7O1uCesFYEtd3gVSjfH60NmlBEuDiZdiTisstGoa3dHJ3Dm4uOeg3hWo JsQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nDXOA7Vm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y5si4081820ioq.102.2021.06.16.16.08.17; Wed, 16 Jun 2021 16:08:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nDXOA7Vm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234634AbhFPPlw (ORCPT + 99 others); Wed, 16 Jun 2021 11:41:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:51316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235119AbhFPPiq (ORCPT ); Wed, 16 Jun 2021 11:38:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CBF24613DC; Wed, 16 Jun 2021 15:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623857785; bh=h0rZ5FQAxT8ND2ifY7DwPtVHKTPACvufXoWIOr2YVnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nDXOA7Vmz/Ff84vVZprSn/4yc8je1DgovnTNiUh7ykrcaI36wbTxHa3c2DsDyFveN wM7ALVmX1dLFANWoeybpemWNOlmAmM8KcjMOQmFq8SZcBRbEJCmqtgBaM1DkW+fo7A daEf3Fga+9movBlA2ZeFaNi9LVYF6Uhf0NkaGdK0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Ahelenia=20Ziemia=C5=84ska?= , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 07/38] HID: multitouch: set Stylus suffix for Stylus-application devices, too Date: Wed, 16 Jun 2021 17:33:16 +0200 Message-Id: <20210616152835.637808448@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210616152835.407925718@linuxfoundation.org> References: <20210616152835.407925718@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ahelenia Ziemiańska [ 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 Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- 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 8580ace596c2..e5a3704b9fe8 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; -- 2.30.2