From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC009C4363A for ; Tue, 27 Oct 2020 17:57:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 735142076D for ; Tue, 27 Oct 2020 17:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603821449; bh=hFYmqeqPJGn0nx6FebWGZH7BGjxLl1jiSFbHq0FO1hI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bf8g2dvHxOtijGG7HibK8uRwLGi3b2kfZRBjq7TVa1FbTfR5XOhPrnPMJ+JWCSTt1 Klc7NlPBE1vyjbVM8MBDkJ3FqF0dWS4mhMi6ClAIlC5T7uwSKVH75+APrR3uuMKpaT qhaO+oiYsy7uUYdnbDr4+Ejd8OuuyTQOXIEEUWvE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1818876AbgJ0R52 (ORCPT ); Tue, 27 Oct 2020 13:57:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:46106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408015AbgJ0OVq (ORCPT ); Tue, 27 Oct 2020 10:21:46 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 59055206D4; Tue, 27 Oct 2020 14:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808505; bh=hFYmqeqPJGn0nx6FebWGZH7BGjxLl1jiSFbHq0FO1hI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0XYY1IaNUBNLtqmV4/wIUaaXlD2g7GYgpec+jUwpXwjKNpfZgH705/5Eh94kCDkcN DDVWHoX5ay9fJfbZQPd3qQDmOd/N78hOlmAdi8GR3gEOYgFKrwP8Gy8j9GHJuAGRXE JSze7bHO/iEnu0IcusQN9NnHy7v4qcySWaJPMXP4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kenneth Albanowski , Dmitry Torokhov , Jiri Kosina , Sasha Levin Subject: [PATCH 4.19 110/264] HID: hid-input: fix stylus battery reporting Date: Tue, 27 Oct 2020 14:52:48 +0100 Message-Id: <20201027135435.840736244@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@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: Dmitry Torokhov [ Upstream commit 505f394fa239cecb76d916aa858f87ed7ea7fde4 ] With commit 4f3882177240 hid-input started clearing of "ignored" usages to avoid using garbage that might have been left in them. However "battery strength" usages should not be ignored, as we do want to use them. Fixes: 4f3882177240 ("HID: hid-input: clear unmapped usages") Reported-by: Kenneth Albanowski Tested-by: Kenneth Albanowski Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index a9da1526c40ae..11bd2ca22a2e6 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -796,7 +796,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x3b: /* Battery Strength */ hidinput_setup_battery(device, HID_INPUT_REPORT, field); usage->type = EV_PWR; - goto ignore; + return; case 0x3c: /* Invert */ map_key_clear(BTN_TOOL_RUBBER); @@ -1052,7 +1052,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case HID_DC_BATTERYSTRENGTH: hidinput_setup_battery(device, HID_INPUT_REPORT, field); usage->type = EV_PWR; - goto ignore; + return; } goto unknown; -- 2.25.1