X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Finput%2Fjoystick%2Fxpad.c;h=247fd3a6fc035753083792fbfb8a4fc3b04e807e;hb=0cce284537fb42d9c28b9b31038ffc9b464555f5;hp=c06b717139ad62f7f2d3bdb8e1368127ae7b6510;hpb=cefb26d4b37c329f624eb235a1bdc7b6b8dd9430;p=mirror_ubuntu-bionic-kernel.git

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);