Commit 58c59bc9 authored Aug 09, 2013 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fix from Jiri Kosina:
 "Revert of a patch which breaks enumeration workaround in
  hid-logitech-dj"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: hid-logitech-dj: querying_devices was never set"

parents 78ebf0e3 8e5654ce

drivers/hid/hid-logitech-dj.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -488,8 +488,6 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
		if (djrcv_dev->querying_devices)
		return 0;

		djrcv_dev->querying_devices = true;

		dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
		if (!dj_report)
		return -ENOMEM;