Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
HID: Fix DRIVER_DESC macro
HID: mousepoll parameter makes no sense for generic HID
HID: tiny patch to remove a kmalloc cast
HID: fix mappings for DiNovo Edge Keyboard - Logitech USB BT receiver
+7
-14
+2
-10
drivers/hid/hid-core.c
+2
-10
drivers/hid/hid-core.c
···
40
40
41
41
#define DRIVER_VERSION "v2.6"
42
42
#define DRIVER_AUTHOR "Andreas Gal, Vojtech Pavlik"
43
-
#define DRIVER_DESC "USB HID core driver"
43
+
#define DRIVER_DESC "HID core driver"
44
44
#define DRIVER_LICENSE "GPL"
45
-
46
-
/*
47
-
* Module parameters.
48
-
*/
49
-
50
-
static unsigned int hid_mousepoll_interval;
51
-
module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
52
-
MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
53
45
54
46
/*
55
47
* Register a new report for a device.
···
648
656
for (i = 0; i < HID_REPORT_TYPES; i++)
649
657
INIT_LIST_HEAD(&device->report_enum[i].report_list);
650
658
651
-
if (!(device->rdesc = (__u8 *)kmalloc(size, GFP_KERNEL))) {
659
+
if (!(device->rdesc = kmalloc(size, GFP_KERNEL))) {
652
660
kfree(device->collection);
653
661
kfree(device);
654
662
return NULL;
+5
-4
drivers/hid/hid-input.c
+5
-4
drivers/hid/hid-input.c
···
68
68
#define map_led(c) do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0)
69
69
70
70
#define map_abs_clear(c) do { map_abs(c); clear_bit(c, bit); } while (0)
71
+
#define map_rel_clear(c) do { map_rel(c); clear_bit(c, bit); } while (0)
71
72
#define map_key_clear(c) do { map_key(c); clear_bit(c, bit); } while (0)
72
73
73
74
#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
···
293
292
}
294
293
}
295
294
296
-
map_key(code);
295
+
map_key_clear(code);
297
296
break;
298
297
299
298
···
344
343
case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
345
344
case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
346
345
if (field->flags & HID_MAIN_ITEM_RELATIVE)
347
-
map_rel(usage->hid & 0xf);
346
+
map_rel_clear(usage->hid & 0xf);
348
347
else
349
-
map_abs(usage->hid & 0xf);
348
+
map_abs_clear(usage->hid & 0xf);
350
349
break;
351
350
352
351
case HID_GD_HATSWITCH:
···
501
500
case 0x22f: map_key_clear(KEY_ZOOMRESET); break;
502
501
case 0x233: map_key_clear(KEY_SCROLLUP); break;
503
502
case 0x234: map_key_clear(KEY_SCROLLDOWN); break;
504
-
case 0x238: map_rel(REL_HWHEEL); break;
503
+
case 0x238: map_rel_clear(REL_HWHEEL); break;
505
504
case 0x25f: map_key_clear(KEY_CANCEL); break;
506
505
case 0x279: map_key_clear(KEY_REDO); break;
507
506