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 89C77C77B75 for ; Tue, 9 May 2023 21:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235957AbjEIVUk (ORCPT ); Tue, 9 May 2023 17:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235735AbjEIVT5 (ORCPT ); Tue, 9 May 2023 17:19:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39CE455A2; Tue, 9 May 2023 14:19:53 -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 AB76F6345E; Tue, 9 May 2023 21:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 669F4C433AE; Tue, 9 May 2023 21:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683667191; bh=g9prx3esPToioC3dxuzEq/G3HcPLo5XUJrxKALgekOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ugstpzZ+sncjaiWd04NCh3HPVu65Su7JIfqeAzVRotE5adMbGUws/WK5u8PKHl2x2 RTEfWZLaZNED454TA5RzOlALfYJFWrt7LVvyT+PPMu1drmfIQhEvZqmzoKvPp4aXPR bFGNP276MkDMYtRgIOzLq6PE5ezFeaPbXrZSZALRgMREpVwh8OL3pDs7dNt9MDEKE7 ceCww7ynDld5XhVKA2hrz5Ctpk2KInDAwhpSL01ObYr+rNnb2PBJl8WAf5v8oQcadP SO3poQ0x1Jwo9mYaJ7simcNnYtg09W/r/PiBdmk2v8KfEDxH54YHX0AhXazODR+Alp XAxZRkrkMfcsQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vicki Pfau , Dmitry Torokhov , Sasha Levin , rojtberg@gmail.com, nate@yocom.org, mkorpershoek@baylibre.com, chaorace@gmail.com, pgriffais@valvesoftware.com, s.demassari@gmail.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 15/18] Input: xpad - add constants for GIP interface numbers Date: Tue, 9 May 2023 17:19:23 -0400 Message-Id: <20230509211928.21010-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509211928.21010-1-sashal@kernel.org> References: <20230509211928.21010-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: Vicki Pfau [ Upstream commit f9b2e603c6216824e34dc9a67205d98ccc9a41ca ] Wired GIP devices present multiple interfaces with the same USB identification other than the interface number. This adds constants for differentiating two of them and uses them where appropriate Signed-off-by: Vicki Pfau Link: https://lore.kernel.org/r/20230411031650.960322-2-vi@endrift.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/joystick/xpad.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 29131f1a2f067..f617b2c60819c 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -559,6 +559,9 @@ struct xboxone_init_packet { #define GIP_MOTOR_LT BIT(3) #define GIP_MOTOR_ALL (GIP_MOTOR_R | GIP_MOTOR_L | GIP_MOTOR_RT | GIP_MOTOR_LT) +#define GIP_WIRED_INTF_DATA 0 +#define GIP_WIRED_INTF_AUDIO 1 + /* * This packet is required for all Xbox One pads with 2015 * or later firmware installed (or present from the factory). @@ -2003,7 +2006,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id } if (xpad->xtype == XTYPE_XBOXONE && - intf->cur_altsetting->desc.bInterfaceNumber != 0) { + intf->cur_altsetting->desc.bInterfaceNumber != GIP_WIRED_INTF_DATA) { /* * The Xbox One controller lists three interfaces all with the * same interface class, subclass and protocol. Differentiate by -- 2.39.2