diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 21:37:43 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 21:37:43 +0100 |
| commit | 0cce284537fb42d9c28b9b31038ffc9b464555f5 (patch) | |
| tree | e7af3b5fe2d04ef6527b5da50851d498ee13184e /drivers/input/joystick/xpad.c | |
| parent | Input: touchscreen - drop unnecessary calls to input_set_drvdata (diff) | |
| parent | Linux 4.10-rc5 (diff) | |
| download | linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.tar.xz linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.zip | |
Merge tag 'v4.10-rc5' into next
Sync up with mainline to bring up improvements in various subsystems.
Diffstat (limited to 'drivers/input/joystick/xpad.c')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index c06b717139ad..247fd3a6fc03 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -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); |