From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82490211A14 for ; Mon, 3 Aug 2026 19:15:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785784560; cv=none; b=WJ2D5tQobaPKD8BrU6PSb4l8EzVMRAtrPPmWJOOK4IqH/r/iu6sf8yJDCYBBztkF/tyi+5fMqAuvyUtk3qMKuzj9F1WlPmwE3UcC/9e/DyzppbeSs5IsbELHKZ9WipvajSa2K2McvE0sUoy5WM+IA6YFWr5xNAP4G97YMNOr+sE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785784560; c=relaxed/simple; bh=PZWvz1oiGO+EiDzGefrVoSQrphvSc4XUZ+9vkyTuOLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PTomaTzw8IAXqUrTlSaClIxgNPiOnyJUYPR9gfBPcfTEpCUVsoB2LD3ghIjQx35AhEjKi/r6U6scd232QdpxpMpUIaOPYXMMDtHrm1nq1J959D9mjr2VkKzrYOY5le6OygzNQ9u6DtWE0i0S3z0TcQsmvCa46KczHyR/f7XCOmg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gtEaeE6e; arc=none smtp.client-ip=209.85.160.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gtEaeE6e" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-527e352a167so24008721cf.1 for ; Mon, 03 Aug 2026 12:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785784557; x=1786389357; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=rFCxfeOgVEQCpE619CeSJ8Vcr/viRMH26O07kTeRsnw=; b=gtEaeE6eEm9zAxxENzophgkmw1xIV23LMnAXXcvHMOSaOkuO8NskCmRXAkU8Uxs0T+ YXC0Kguu1FF/nvk/rvANCdbYZ7AP7vfQk4Dra9nCdYYgcFxKKWv1STZWREYIewNdkTzx fC2PMIYKTFYrzmvXtD1g257js5Zu0ezZo7n3EspE8QH45G2nwc/3f/u8N9oiVqmmWfqL o90yPsKx4EJjEGsht8JNgClTooZxdQc1P4CaifhXf7VNACWClitVMKqJVbuzDsqlny+U OXjZeqq6mzSwz54hCg01XUqeH059d+W+Qn8dDs2g7iZmgRG3NU0z3gcO7P6dmXXeVvhM wSkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785784557; x=1786389357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=rFCxfeOgVEQCpE619CeSJ8Vcr/viRMH26O07kTeRsnw=; b=O4AKhZUApi3Us66cruLLzHElSh1fLsgDgRfAGW3I4bi0e9DYJPSeDtPnGJnzNLFAe7 aLnZ4I9t6lQITE0ecRZkNXoCwCqYiAJXJWUcVJHxeFlYhl5i1AB5ErHlRchV9A/Uzv9m N4F+uC111M7tuYIHPZZkhsnh5PoSlIuNZmZBS2FyZjD5i0cX764NSV3+xLi5yK6NHDVU v5Cfy8gOshIMIpzyGLvPphEVSAt/aAvqfdewomNWYL9Bj4BKYxPt5TckfNIubwnrivVZ KCFYsyDkzDUM7NL974U0lfC1FkywRsR9SXxZrpyeve4r7depsjgQruxE7q8VHc0WdOKh 3q/w== X-Forwarded-Encrypted: i=1; AHgh+RrNeKwIXTxTMLm88+zRzliDoIANaabBNJ5IWH0Cr02tW+/bLTIb1OVgkShtRbjs3EoZPuLjicnlQeKprhw=@vger.kernel.org X-Gm-Message-State: AOJu0YzhCx+HvEEjnwrEcKcIkDI+Ej1OFR95chuCSX7F2q8vJzZ8GS/V MHu5B/wqkxpyAA3pYYgw3iBtnPMzNM2Y4XfEp3dg3AXDXVJJg0UMlvYu X-Gm-Gg: AR+sD10nq45XKDFGo//xbxr0dj2zTpI0kAIsKRdLIDJhO0p4lpVCQB8vlMGqGcVsVTa Fisbdo/K4CS/HF9i79MhGV3iHdXPPiswiqQ90xG7vlcDHfHehYEIovUhTGqEfOtnoT5uN0YxdmT 6c8s0m2jaPgUwtuwD1wI3GqE8f/CZUZCfGjkseEL3wtE1pC9gU6oCUdVyKxJxXObOOIcK+y6Gmh Mc2eg/WfCFCHmQTiXkFEBlJ7YgZslKEPHEPebjMvPiVfcfocK2o8jcqM7WN1zST+Cfe1VtukKUp vGEl/LHNvJhLfEo0zVT0RNgiCvLOg7kVAPa1KBsuLCAWHiaDrNu/3sA24dp8nUalhAIUvn26KAj 7HPbBcMbk+hzKsY/Mwq2OUuwE5cRkafggcz9FjSiLimdrrdv1Seu8M5KBZmXZz+RNOyqwnUblkv sIxNtlQZ8Hdn4VJ4cFJ0BBqp+CS1THYqmGf7aLdw/a4E4N9jq4MNS4ZTCmEgeXSWwPqOBo61Mo0 x4kpTMrYzGF79+HguQ= X-Received: by 2002:ac8:5c85:0:b0:51c:61a:50e6 with SMTP id d75a77b69052e-52b566f6d04mr218681631cf.3.1785784557192; Mon, 03 Aug 2026 12:15:57 -0700 (PDT) Received: from achantapc.tail227c81.ts.net ([2600:4040:122e:7d00:f04d:e0df:fe04:e789]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52b4e64df9bsm67803541cf.0.2026.08.03.12.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 12:15:56 -0700 (PDT) From: Sriman Achanta To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Bastien Nocera , Simon Wood , Christian Mayer , Sriman Achanta Subject: [PATCH v7 1/8] HID: steelseries: Fix ARCTIS_1_X device mislabeling Date: Mon, 3 Aug 2026 15:15:46 -0400 Message-ID: <20260803191553.66368-2-srimanachanta@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260803191553.66368-1-srimanachanta@gmail.com> References: <20260803191553.66368-1-srimanachanta@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The SteelSeries Arctis 1 Wireless for Xbox (0x12b6) was labelled as the plain Arctis 1 Wireless. Rename USB_DEVICE_ID_STEELSERIES_ARCTIS_1 to USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X, along with the matching quirk flag and device table entry. The device ID value is unchanged. Signed-off-by: Sriman Achanta --- drivers/hid/hid-ids.h | 4 ++-- drivers/hid/hid-quirks.c | 2 +- drivers/hid/hid-steelseries.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index b70f719b3b07..70b30e13b96f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1377,8 +1377,8 @@ #define USB_VENDOR_ID_STEELSERIES 0x1038 #define USB_DEVICE_ID_STEELSERIES_SRWS1 0x1410 -#define USB_DEVICE_ID_STEELSERIES_ARCTIS_1 0x12b6 -#define USB_DEVICE_ID_STEELSERIES_ARCTIS_9 0x12c2 +#define USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X 0x12b6 +#define USB_DEVICE_ID_STEELSERIES_ARCTIS_9 0x12c2 #define USB_DEVICE_ID_STEELSERIES_MSI_KLC 0x1122 #define USB_DEVICE_ID_STEELSERIES_MSI_ALC 0x1161 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 57d8efdd9b89..f546179858c2 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -747,7 +747,7 @@ static const struct hid_device_id hid_have_special_driver[] = { #endif #if IS_ENABLED(CONFIG_HID_STEELSERIES) { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) }, - { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X) }, { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_9) }, #endif #if IS_ENABLED(CONFIG_HID_SUNPLUS) diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c index 73f77dd07110..54efa70d128d 100644 --- a/drivers/hid/hid-steelseries.c +++ b/drivers/hid/hid-steelseries.c @@ -21,7 +21,7 @@ #include "hid-ids.h" #define STEELSERIES_SRWS1 BIT(0) -#define STEELSERIES_ARCTIS_1 BIT(1) +#define STEELSERIES_ARCTIS_1_X BIT(1) #define STEELSERIES_ARCTIS_9 BIT(2) #define STEELSERIES_MSI_RGB BIT(3) @@ -396,7 +396,7 @@ static void steelseries_headset_fetch_battery(struct hid_device *hdev) { int ret = 0; - if (hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1) + if (hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X) ret = steelseries_headset_request_battery(hdev, arctis_1_battery_request, sizeof(arctis_1_battery_request)); else if (hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_9) @@ -829,7 +829,7 @@ static int steelseries_probe(struct hid_device *hdev, const struct hid_device_id return 0; } - if ((sd->quirks & (STEELSERIES_ARCTIS_1 | STEELSERIES_ARCTIS_9)) && + if ((sd->quirks & (STEELSERIES_ARCTIS_1_X | STEELSERIES_ARCTIS_9)) && steelseries_headset_battery_register(sd) < 0) hid_err(sd->hdev, "Failed to register battery for headset\n"); @@ -897,7 +897,7 @@ static uint8_t steelseries_headset_map_capacity(uint8_t capacity, uint8_t min_in static bool steelseries_is_headset(struct hid_device *hdev) { - return hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1 || + return hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X || hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_9; } @@ -923,7 +923,7 @@ static int steelseries_headset_raw_event(struct hid_device *hdev, connected = sd->headset_connected; charging = sd->battery_charging; - if (hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1) { + if (hdev->product == USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X) { hid_dbg(sd->hdev, "Parsing raw event for Arctis 1 headset (%*ph)\n", size, read_buf); if (size < ARCTIS_1_BATTERY_RESPONSE_LEN || @@ -1010,8 +1010,8 @@ static const struct hid_device_id steelseries_devices[] = { .driver_data = STEELSERIES_SRWS1 }, { /* SteelSeries Arctis 1 Wireless for XBox */ - HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_1), - .driver_data = STEELSERIES_ARCTIS_1 }, + HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_1_X), + .driver_data = STEELSERIES_ARCTIS_1_X }, { /* SteelSeries Arctis 9 Wireless for XBox */ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_ARCTIS_9), -- 2.55.0