xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.10-rc5' into next

Browse Source 
Sync up with mainline to bring up improvements in various subsystems.
This commit is contained in:
Dmitry Torokhov
2017-01-24 12:37:43 -08:00
parent cefb26d4b3 7a308bb301
commit 0cce284537
17709 changed files with 1338764 additions and 566873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/joystick/xpad.c
View File

@@ -1357,6 +1357,12 @@ static int xpad_init_input(struct usb_xpad *xpad)
input_dev->name = xpad->name;
input_dev->phys = xpad->phys;
usb_to_input_id(xpad->udev, &input_dev->id);
if (xpad->xtype == XTYPE_XBOX360W) {
/* x360w controllers and the receiver have different ids */
input_dev->id.product = 0x02a1;
}
input_dev->dev.parent = &xpad->intf->dev;
input_set_drvdata(input_dev, xpad);