Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- Genius Gx Imperator Keyboard regression fix (missing break in case),
by Ben Hutchings
- duplicate sysfs entry error fix for hid-sensor-hub driver, by
Srinivas Pandruvada
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hid-sensor-hub: fix duplicate sysfs entry error
HID: kye: Fix missing break in kye_report_fixup()
+3
+1
drivers/hid/hid-kye.c
+1
drivers/hid/hid-kye.c
···
341
341
case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:
342
342
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,
343
343
"Genius Gx Imperator Keyboard");
344
+
break;
344
345
case USB_DEVICE_ID_GENIUS_MANTICORE:
345
346
rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
346
347
"Genius Manticore Keyboard");
+2
drivers/hid/hid-sensor-hub.c
+2
drivers/hid/hid-sensor-hub.c
···
569
569
goto err_free_names;
570
570
}
571
571
sd->hid_sensor_hub_client_devs[
572
+
sd->hid_sensor_client_cnt].id = PLATFORM_DEVID_AUTO;
573
+
sd->hid_sensor_hub_client_devs[
572
574
sd->hid_sensor_client_cnt].name = name;
573
575
sd->hid_sensor_hub_client_devs[
574
576
sd->hid_sensor_client_cnt].platform_data =