Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits) HID: build drivers for all quirky devices by default HID: add missing blacklist entry for Apple ATV ircontrol HID: add support for Bright ABNT2 brazilian device HID: Don't let Avermedia Radio FM800 be handled by usb hid drivers HID: fix numlock led on Dell device 0x413c/0x2105 HID: remove warn() macro from usb hid drivers HID: remove info() macro from usb HID drivers HID: add appletv IR receiver quirk HID: fix a lockup regression when using force feedback on a PID device HID: hiddev.h: Fix example code. HID: hiddev.h: Fix mixed space and tabs in example code. HID: convert to dev_* prints HID: remove hid-ff HID: move zeroplus FF processing HID: move thrustmaster FF processing HID: move pantherlord FF processing HID: fix incorrent length condition in hidraw_write() HID: fix tty<->hid deadlock HID: ignore iBuddy devices HID: report descriptor fix for remaining MacBook JIS keyboards ...
This commit is contained in:
@@ -206,6 +206,20 @@ static void do_usb_table(void *symval, unsigned long size,
|
||||
do_usb_entry_multi(symval + i, mod);
|
||||
}
|
||||
|
||||
/* Looks like: hid:bNvNpN */
|
||||
static int do_hid_entry(const char *filename,
|
||||
struct hid_device_id *id, char *alias)
|
||||
{
|
||||
id->vendor = TO_NATIVE(id->vendor);
|
||||
id->product = TO_NATIVE(id->product);
|
||||
|
||||
sprintf(alias, "hid:b%04X", id->bus);
|
||||
ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
|
||||
ADD(alias, "p", id->product != HID_ANY_ID, id->product);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Looks like: ieee1394:venNmoNspNverN */
|
||||
static int do_ieee1394_entry(const char *filename,
|
||||
struct ieee1394_device_id *id, char *alias)
|
||||
@@ -745,6 +759,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
|
||||
else if (sym_is(symname, "__mod_usb_device_table"))
|
||||
/* special case to handle bcdDevice ranges */
|
||||
do_usb_table(symval, sym->st_size, mod);
|
||||
else if (sym_is(symname, "__mod_hid_device_table"))
|
||||
do_table(symval, sym->st_size,
|
||||
sizeof(struct hid_device_id), "hid",
|
||||
do_hid_entry, mod);
|
||||
else if (sym_is(symname, "__mod_ieee1394_device_table"))
|
||||
do_table(symval, sym->st_size,
|
||||
sizeof(struct ieee1394_device_id), "ieee1394",
|
||||
|
||||
Reference in New Issue
Block a user