From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3948750E5B3; Wed, 30 Sep 2026 16:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785964; cv=none; b=sJoPyhoRTA451L2rU9p26Bjk/GQpUf9mbs8clGg4ixUYQvAAf9VibuLTVmArVJjV2vcLwGO2p2E/6XoGPAZTqOBZwSeq45Xwrng8fszRPfa5gsSJ4WpGWd6QibmyfgkE4plSt7gysOpHJb7g5WsvUUmYs6Div97xiotQyTpp5wI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785964; c=relaxed/simple; bh=q+fQpMnVrooLwufd3AgYInQyPn3Jx16d9a0zrAiUYrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kiQxr+aON40PY9WwIOYc1F06bGMO2v9M9fJytXi5+VR/ie71XF9Lpy4bEOEgi6hIcYuCbRI+nV4fGjJyXM9BXTBZt4Z0lrBnFZW8iRKAYWi8QANlKjJwdI565T1+YHLuzSkuN8CYqSgVD9LAprEu8PKJR88fhOLbqBnkkJeNwCU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rb4AAqPN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rb4AAqPN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9575F1F000FF; Wed, 30 Sep 2026 16:32:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785963; bh=FdIj1EzyACKOPWwJNIuwJY+E1m46MdYDegZ0GfS2WlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rb4AAqPN0TtAg9dSNMY6iAyvTZoGhfmK4giolYiPS4NIrqKMrbeGNbMRg1AmPfjgL vUdDgQ7GkvvyFT/HQPbqqa1PAQOFnjbR2i9QB/l+svRu0tWz5sYZu/WDDCcF2rRU37 6AbMliHZNcLHBRya/bJDC/EULmC+gHK/rx4ltP9g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeremy Nyberg , Dmitry Torokhov Subject: [PATCH 6.1 695/982] Input: xpad - fix PDP Marvel Xbox 360 controller Date: Wed, 30 Sep 2026 17:23:51 +0200 Message-ID: <20260930152431.687634270@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeremy Nyberg commit 7bc369cb3d3f3656eb77285628ee264264d28ad4 upstream. The PDP Marvel Xbox 360 controller with USB ID 0e6f:0147 is incorrectly classified as an Xbox One controller. With the current XTYPE_XBOXONE classification, the controller is detected but produces no input, while its four player LEDs continue blinking indefinitely. Classify USB ID 0e6f:0147 as an Xbox 360 controller instead. Tested on a PDP Marvel Xbox 360 controller with USB ID 0e6f:0147. All inputs register correctly and the player LED indicates the current player. Fixes: c225370e01b8 ("Input: xpad - sync supported devices with 360Controller") Cc: stable@vger.kernel.org Signed-off-by: Jeremy Nyberg Link: https://patch.msgid.link/20260910071627.236014-1-SlickStretch3.0@gmail.com Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -229,7 +229,7 @@ static const struct xpad_device { { 0x0e6f, 0x0139, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x013a, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One", 0, XTYPE_XBOXONE }, - { 0x0e6f, 0x0147, "PDP Marvel Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x0147, "PDP Marvel Xbox 360 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x015c, "PDP Xbox One Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x0e6f, 0x0161, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0162, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },