Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1008ebb6 authored Dec 13, 2013 by Linus Torvalds

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()

parents ca336751 d81cae80

drivers/hid/hid-kye.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -341,6 +341,7 @@ static __u8 kye_report_fixup(struct hid_device hdev, __u8 *rdesc,
	case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:		case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:
	rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,		rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,
	"Genius Gx Imperator Keyboard");		"Genius Gx Imperator Keyboard");
			break;
	case USB_DEVICE_ID_GENIUS_MANTICORE:		case USB_DEVICE_ID_GENIUS_MANTICORE:
	rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,		rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
	"Genius Manticore Keyboard");		"Genius Manticore Keyboard");

drivers/hid/hid-sensor-hub.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -568,6 +568,8 @@ static int sensor_hub_probe(struct hid_device *hdev,
	ret = -ENOMEM;		ret = -ENOMEM;
	goto err_free_names;		goto err_free_names;
	}		}
			sd->hid_sensor_hub_client_devs[
			sd->hid_sensor_client_cnt].id = PLATFORM_DEVID_AUTO;
	sd->hid_sensor_hub_client_devs[		sd->hid_sensor_hub_client_devs[
	sd->hid_sensor_client_cnt].name = name;		sd->hid_sensor_client_cnt].name = name;
	sd->hid_sensor_hub_client_devs[		sd->hid_sensor_hub_client_devs[