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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09B3FC7EE2C for ; Sun, 7 May 2023 01:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjEGBDG (ORCPT ); Sat, 6 May 2023 21:03:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230506AbjEGBDA (ORCPT ); Sat, 6 May 2023 21:03:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F57511571; Sat, 6 May 2023 18:02:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 935836147A; Sun, 7 May 2023 00:34:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52ABBC4339B; Sun, 7 May 2023 00:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683419686; bh=5vwZpcceyRrfxiLRVOzRJyx0uAeCvgClQatdYcRS+ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXvMbTL8aCGX0bWUjcjtVyMyCoBU9M9ggEbZY2Ih4vnYsqk+tV0FxtNh5UNXQQgNM EBNxoHFcSfnnqzProoEWvIpCEKqBpKJ2LVAnH6pYXgy+lXKq6updYTGUPSAk9BK8WC rpduW7iMD2IhyB9RbJYu3NyjN2DAjNhLZ6p9bGPQapyAKHbKaWUU2N6nBKSy2w68Eq tfrlyP2JhndZRz39aTHv9l97Xst5PGTHZtgSyETU+nfCmaB1qLhvVWkHQ5hQeX2J19 HdFy4yErsMUv0kh1o8kfN/SL5s5yWP+Hv7FLsOAnwfqfsVwytPIpbUfoPjqRPURiEM Q4nyNcScckF4Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bastien Nocera , Benjamin Tissoires , Sasha Levin , jikos@kernel.org, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 08/19] HID: logitech-hidpp: Reconcile USB and Unifying serials Date: Sat, 6 May 2023 20:34:06 -0400 Message-Id: <20230507003417.4077259-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507003417.4077259-1-sashal@kernel.org> References: <20230507003417.4077259-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: stable@vger.kernel.org From: Bastien Nocera [ Upstream commit 5b3691d15e04b6d5a32c915577b8dbc5cfb56382 ] Now that USB HID++ devices can gather a serial number that matches the one that would be gathered when connected through a Unifying receiver, remove the last difference by dropping the product ID as devices usually have different product IDs when connected through USB or Unifying. For example, on the serials on a G903 wired/wireless mouse: - Unifying before patch: 4067-e8-ce-cd-45 - USB before patch: c086-e8-ce-cd-45 - Unifying and USB after patch: e8-ce-cd-45 Signed-off-by: Bastien Nocera Link: https://lore.kernel.org/r/20230302130117.3975-2-hadess@hadess.net Signed-off-by: Benjamin Tissoires Signed-off-by: Sasha Levin --- drivers/hid/hid-logitech-hidpp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index c39a4c56678de..b2cd7527de195 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -838,8 +838,7 @@ static int hidpp_unifying_init(struct hidpp_device *hidpp) if (ret) return ret; - snprintf(hdev->uniq, sizeof(hdev->uniq), "%04x-%4phD", - hdev->product, &serial); + snprintf(hdev->uniq, sizeof(hdev->uniq), "%4phD", &serial); dbg_hid("HID++ Unifying: Got serial: %s\n", hdev->uniq); name = hidpp_unifying_get_name(hidpp); @@ -974,8 +973,7 @@ static int hidpp_serial_init(struct hidpp_device *hidpp) if (ret) return ret; - snprintf(hdev->uniq, sizeof(hdev->uniq), "%04x-%4phD", - hdev->product, &serial); + snprintf(hdev->uniq, sizeof(hdev->uniq), "%4phD", &serial); dbg_hid("HID++ DeviceInformation: Got serial: %s\n", hdev->uniq); return 0; -- 2.39.2