diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 06:51:31 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 06:51:31 +0200 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/usb/input/powermate.c | |
| parent | [PATCH] SATA: rewritten sil24 driver (diff) | |
| parent | [PATCH] iSeries build with newer assemblers and compilers (diff) | |
| download | linux-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.tar.xz linux-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/usb/input/powermate.c')
| -rw-r--r-- | drivers/usb/input/powermate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c index 3975b309d55f..ad4afe7e5897 100644 --- a/drivers/usb/input/powermate.c +++ b/drivers/usb/input/powermate.c @@ -35,6 +35,7 @@ #include <linux/init.h> #include <linux/spinlock.h> #include <linux/usb.h> +#include <linux/usb_input.h> #define POWERMATE_VENDOR 0x077d /* Griffin Technology, Inc. */ #define POWERMATE_PRODUCT_NEW 0x0410 /* Griffin PowerMate */ @@ -389,10 +390,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i pm->input.keybit[LONG(BTN_0)] = BIT(BTN_0); pm->input.relbit[LONG(REL_DIAL)] = BIT(REL_DIAL); pm->input.mscbit[LONG(MSC_PULSELED)] = BIT(MSC_PULSELED); - pm->input.id.bustype = BUS_USB; - pm->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor); - pm->input.id.product = le16_to_cpu(udev->descriptor.idProduct); - pm->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice); + usb_to_input_id(udev, &pm->input.id); pm->input.event = powermate_input_event; pm->input.dev = &intf->dev; pm->input.phys = pm->phys; |