diff options
Diffstat (limited to 'drivers/usb/input/xpad.c')
-rw-r--r-- | drivers/usb/input/xpad.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index a7fa1b17dcfe..18125e0bffa2 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #include <linux/module.h> | 62 | #include <linux/module.h> |
63 | #include <linux/smp_lock.h> | 63 | #include <linux/smp_lock.h> |
64 | #include <linux/usb.h> | 64 | #include <linux/usb.h> |
65 | #include <linux/usb_input.h> | ||
65 | 66 | ||
66 | #define DRIVER_VERSION "v0.0.5" | 67 | #define DRIVER_VERSION "v0.0.5" |
67 | #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" | 68 | #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" |
@@ -256,10 +257,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
256 | 257 | ||
257 | xpad->udev = udev; | 258 | xpad->udev = udev; |
258 | 259 | ||
259 | xpad->dev.id.bustype = BUS_USB; | 260 | usb_to_input_id(udev, &xpad->dev.id); |
260 | xpad->dev.id.vendor = le16_to_cpu(udev->descriptor.idVendor); | ||
261 | xpad->dev.id.product = le16_to_cpu(udev->descriptor.idProduct); | ||
262 | xpad->dev.id.version = le16_to_cpu(udev->descriptor.bcdDevice); | ||
263 | xpad->dev.dev = &intf->dev; | 261 | xpad->dev.dev = &intf->dev; |
264 | xpad->dev.private = xpad; | 262 | xpad->dev.private = xpad; |
265 | xpad->dev.name = xpad_device[i].name; | 263 | xpad->dev.name = xpad_device[i].name; |