diff mbox

Bug in recent pad patch (96eb371b816c)

Message ID 69517E60-A1A3-4B2E-ABE3-B268CB5371E5@gmail.com (mailing list archive)
State Accepted
Headers show

Commit Message

Cameron Gutman Jan. 6, 2017, 6:06 p.m. UTC 
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:


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dmitry Torokhov Jan. 6, 2017, 6:34 p.m. UTC | #1 
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 */
>
diff mbox

Patch

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 */