From patchwork Fri May 27 00:12:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Rojtberg X-Patchwork-Id: 9137489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 534A2607DA for ; Fri, 27 May 2016 00:13:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41908282FB for ; Fri, 27 May 2016 00:13:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30E9228300; Fri, 27 May 2016 00:13:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93FB4282FB for ; Fri, 27 May 2016 00:13:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755514AbcE0ANP (ORCPT ); Thu, 26 May 2016 20:13:15 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35896 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755453AbcE0ANP (ORCPT ); Thu, 26 May 2016 20:13:15 -0400 Received: by mail-wm0-f65.google.com with SMTP id q62so9970489wmg.3 for ; Thu, 26 May 2016 17:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gvn1s/aLasXUQ0a4v60I+jlIdzxg6AHovgf7z2qm+a4=; b=i4QpEvMvLxaj16FuJhWwNiDUKr+93a51IV+gqt0sec4RJV6+PuOg+6Xz/FtTsukBbN 8u0tZpon/IC7ZMfLavLHyWALvssSUYzjQ+QDCqbZ9XxpxG3McPST+XbUJMuoiGWwgyNd I1vKVaTdAaZ5PFVrboYpFl6Qy6AgZSWbkENZ3/HbzE5NQ5AwyHfq6oT7pftJZUaz1r3s 7GFrEzr8Xv4X33m2KmtbFI6PoRWCN1o56zr49i6HgWECsUfs49u5pZEz0qbPWzLfzGls B5SjKjejO2kHE/gtI+9sAAWuTxkZB4APP6yAB1VK18557Gocf9jc6sxrDCp6v4pESjZF Xi4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Gvn1s/aLasXUQ0a4v60I+jlIdzxg6AHovgf7z2qm+a4=; b=OgXCyjjmsynqkdnC7NS4tbJ1pBxsobPRtSkqj5fDFl9ri5IWtj9uOhZRG1WtuTP5dj YLsMWdR3wwC6v3vLFE69+/71ISu0Vr+MO7iGG4ZFYSHP3G1q23l0YnmmW24K1iPkMl06 Vdf70SxyaRXyZPsOJLsgLI/mY1MPEgJzZPN1DgU2YHuFGsjWGfg5mx1dh05+7J9yFxlb f7Y/YHCvW3L7oBxdbPVW9v/8zMmhD0jjEaFGQC+XJmapGXPg1Lbuqptio/buiRss9uQt q6gLIG1boW2LthElfIAHwui4H50T8RwyFBcKnl/AxWJwUbLAs6nyELTlg6WnPLlcBKg6 3aVw== X-Gm-Message-State: ALyK8tJ+JnfsY0pTGduukCnJiRiHHj545sAA+6kbqeRW9bdybsgO6QZtFnpOQcj3GSSwug== X-Received: by 10.28.128.138 with SMTP id b132mr6281552wmd.53.1464307993621; Thu, 26 May 2016 17:13:13 -0700 (PDT) Received: from deepwhite.fritz.box (p5790B7FB.dip0.t-ipconnect.de. [87.144.183.251]) by smtp.gmail.com with ESMTPSA id kz1sm16628372wjc.46.2016.05.26.17.13.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 May 2016 17:13:13 -0700 (PDT) From: Pavel Rojtberg X-Google-Original-From: Pavel Rojtberg < rojtberg@gmail.com > To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com Cc: Daniel Tobias , Pavel Rojtberg Subject: [PATCH 5/7] Input: xpad: correctly sort vendor id's Date: Fri, 27 May 2016 02:12:53 +0200 Message-Id: <1464307975-25890-6-git-send-email-rojtberg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464307975-25890-1-git-send-email-rojtberg@gmail.com> References: <1464307975-25890-1-git-send-email-rojtberg@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Tobias Signed-off-by: Daniel Tobias Signed-off-by: Pavel Rojtberg --- drivers/input/joystick/xpad.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 804dbcc..ba3ac27 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -315,18 +315,19 @@ static struct usb_device_id xpad_table[] = { XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ + XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ - XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ - XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ - XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ - XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ - XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ + XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ + XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ { } };