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 4BE23C77B75 for ; Tue, 9 May 2023 21:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236011AbjEIVXS (ORCPT ); Tue, 9 May 2023 17:23:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235929AbjEIVV5 (ORCPT ); Tue, 9 May 2023 17:21:57 -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 338EF86A5; Tue, 9 May 2023 14:20:45 -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 4C2A063748; Tue, 9 May 2023 21:20:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12318C433A4; Tue, 9 May 2023 21:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683667241; bh=kjDmwvX1LRkKsG7MuAuwxv7XIPmKH3HNiJd8gJfyPWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JREm2aBBgtbYaiETpOeflgfQu+LddtUl33MHNggFKkyMr/5XmlfpjzQM1gY/a3cmL HqvkcvEkrsMln3Dw7XUYgpMHROZrGwi3EcqKmIMiWZaQ4j4K117vNqdJJgohWY0AF1 Rb9YbHY95zNUfkixp3tbl2MYtEy/hUCuKg8RzQxecNJzM/y99tnd1MbplcRERsrO4m Ujb8ViaRi4mkreBsofo+C+AlcukvJw1DMGIjW7DSHwjC3H30FaMY4CtNRbzlk1jX9S cu3RVFirql+20w8q8sC3fqe858XWvwJN7tD3dyRn2w+Lgz3spPyLL37PvJqdrK6niV MuyLVkf+m4lSA== 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, aicommander@gmail.com, chaorace@gmail.com, s.demassari@gmail.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 13/13] Input: xpad - add constants for GIP interface numbers Date: Tue, 9 May 2023 17:20:21 -0400 Message-Id: <20230509212023.22105-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509212023.22105-1-sashal@kernel.org> References: <20230509212023.22105-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 dbfabd229a7c6..a7af9b56e338f 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -493,6 +493,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). @@ -1821,7 +1824,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