diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-10-14 14:47:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-10-14 14:47:56 +0200 |
| commit | d057fd4cb892087955568a139d15eae4115a0174 (patch) | |
| tree | 4fd631492ff8d2d78c394fd2b054175588a7d633 /drivers/hid/hid-core.c | |
| parent | bb6c8d8fa9b5587eea18078ce0bcf6bb2905789f (diff) | |
| parent | 709d27c04f4eccbc99d57a5569bce028915a4345 (diff) | |
Merge branch 'hidraw' into for-linus
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 317cf8a7b63c..2884b036495a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -30,6 +30,7 @@ #include <linux/hid.h> #include <linux/hiddev.h> #include <linux/hid-debug.h> +#include <linux/hidraw.h> /* * Version Information @@ -979,6 +980,8 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event) hid->hiddev_report_event(hid, report); + if (hid->claimed & HID_CLAIMED_HIDRAW) + hidraw_report_event(hid, data, size); for (n = 0; n < report->maxfield; n++) hid_input_field(hid, report->field[n], data, interrupt); @@ -990,5 +993,18 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i } EXPORT_SYMBOL_GPL(hid_input_report); +static int __init hid_init(void) +{ + return hidraw_init(); +} + +static void __exit hid_exit(void) +{ + hidraw_exit(); +} + +module_init(hid_init); +module_exit(hid_exit); + MODULE_LICENSE(DRIVER_LICENSE); |