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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 20034C64E7D for ; Wed, 25 Nov 2020 15:40:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD3C5221EB for ; Wed, 25 Nov 2020 15:40:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="iKv1YWZd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731165AbgKYPhp (ORCPT ); Wed, 25 Nov 2020 10:37:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:55608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731059AbgKYPhk (ORCPT ); Wed, 25 Nov 2020 10:37:40 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ADD54221FC; Wed, 25 Nov 2020 15:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606318659; bh=MD7qjpm33Nehn5zcoqnTWe5lPG286RmzvYRMqO4sZhY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKv1YWZdwwCRog6NqnIpwK6Te3logeWNObwsV0a5TmnXtqmsKgXcJ7X7YamsD2bOs uWKnT9bFBTXfDh/bjdBcEXddsiq8UWlR1QVC2YTcQ3TfUC1hZ/riB22KT794gNeczF k9lAh3ZmPyXbDOKPnIs0RvXn8/sDPf6Og7p01xec= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pablo Ceballos , Srinivas Pandruvada , Jiri Kosina , Sasha Levin , linux-input@vger.kernel.org, linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 03/12] HID: hid-sensor-hub: Fix issue with devices with no report ID Date: Wed, 25 Nov 2020 10:37:25 -0500 Message-Id: <20201125153734.810826-3-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125153734.810826-1-sashal@kernel.org> References: <20201125153734.810826-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Ceballos [ Upstream commit 34a9fa2025d9d3177c99351c7aaf256c5f50691f ] Some HID devices don't use a report ID because they only have a single report. In those cases, the report ID in struct hid_report will be zero and the data for the report will start at the first byte, so don't skip over the first byte. Signed-off-by: Pablo Ceballos Acked-by: Srinivas Pandruvada Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-sensor-hub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index b5bd5cb7d5324..aa078c1dad14f 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -496,7 +496,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev, return 1; ptr = raw_data; - ptr++; /* Skip report id */ + if (report->id) + ptr++; /* Skip report id */ spin_lock_irqsave(&pdata->lock, flags); -- 2.27.0