diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/usb/input/hid-core.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/hid-core.c')
| -rw-r--r-- | drivers/usb/input/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index a2c56b2de589..3305fb6079eb 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
| @@ -1818,7 +1818,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) | |||
| 1818 | int n, len, insize = 0; | 1818 | int n, len, insize = 0; |
| 1819 | 1819 | ||
| 1820 | /* Ignore all Wacom devices */ | 1820 | /* Ignore all Wacom devices */ |
| 1821 | if (dev->descriptor.idVendor == USB_VENDOR_ID_WACOM) | 1821 | if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_WACOM) |
| 1822 | return NULL; | 1822 | return NULL; |
| 1823 | 1823 | ||
| 1824 | for (n = 0; hid_blacklist[n].idVendor; n++) | 1824 | for (n = 0; hid_blacklist[n].idVendor; n++) |