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 9B3ADC7EE24 for ; Tue, 9 May 2023 21:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236078AbjEIVYB (ORCPT ); Tue, 9 May 2023 17:24:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236097AbjEIVXe (ORCPT ); Tue, 9 May 2023 17:23:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01E139005; Tue, 9 May 2023 14:21:10 -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 CD58163474; Tue, 9 May 2023 21:21:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E71E0C433A7; Tue, 9 May 2023 21:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683667270; bh=4knAG3RUm6soJKDwALrqcaCFg+q9W4kn1/iRmmyAGQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yr4/x71xRRIUooq1+/zlY/AsWBknIgxGkHF/PB85YYx5RzsNy9gkAiVhHVnC5i5Id FAO8pvvQX0BvvPldgtx8z/Q/IP6S3wkZvIImcXt3PWOTf3NYUlmTpjtEmMj3eFr6fO l8Hncbt4w7brmPT0Sk35dvbM3+hgVXnPbK0WitLB2njTUoTHMgA8i/K1Lo9Ugros13 FdWR55QhHHHhyRRAG3IYcoI6riCGAiZbSC0zOGYLwIKuevR8rd+LDRy6NZOYdv0bsy JhuN8us0JRsrvHuY31dV1JLzgcgltyIr9WuZSBDV2FW9ZQViMLFofWp0w9nVvVIp9g dummkVrJG+baw== 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, pgriffais@valvesoftware.com, chaorace@gmail.com, s.demassari@gmail.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 4/4] Input: xpad - add constants for GIP interface numbers Date: Tue, 9 May 2023 17:20:56 -0400 Message-Id: <20230509212058.22651-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509212058.22651-1-sashal@kernel.org> References: <20230509212058.22651-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-input@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 70dedc0f7827c..0bd55e1fca372 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -489,6 +489,9 @@ struct xboxone_init_packet { } +#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). @@ -1813,7 +1816,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