From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: Bug in recent pad patch (96eb371b816c) Date: Fri, 6 Jan 2017 10:34:12 -0800 Message-ID: <20170106183412.GA4119@dtor-ws> References: <69517E60-A1A3-4B2E-ABE3-B268CB5371E5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pg0-f66.google.com ([74.125.83.66]:32991 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032204AbdAFSeP (ORCPT ); Fri, 6 Jan 2017 13:34:15 -0500 Received: by mail-pg0-f66.google.com with SMTP id 194so231869pgd.0 for ; Fri, 06 Jan 2017 10:34:15 -0800 (PST) Content-Disposition: inline In-Reply-To: <69517E60-A1A3-4B2E-ABE3-B268CB5371E5@gmail.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Cameron Gutman Cc: dan.g.tob@gmail.com, linux-input , Pavel Rojtberg On Fri, Jan 06, 2017 at 12:06:39PM -0600, Cameron Gutman wrote: > It looks like the recent commit in master > > 96eb371b816c ("Input: xpad - correctly sort vendor id's") > > adds a duplicate entry for XPAD_XBOXONE_VENDOR(0x24c6). > > You may want to amend that with the following: Thanks, I amended the offending commit. > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > index ceb6a58..c06b717 100644 > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -325,7 +325,6 @@ static struct usb_device_id xpad_table[] = { > 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_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 */ > -- Dmitry