summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-09 11:53:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-09 11:53:06 -0700
commit58c59bc997d86593f0bea41845885917cf304d22 (patch)
tree6828cd2526c9f4a86955389b26314819ea891213 /drivers
parent78ebf0e349421156fe70f437ce6ce3daf068ef56 (diff)
parent8e5654ce6914b950b42d1f896f3d8a75fbf307ae (diff)
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"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-logitech-dj.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 7a5764843bfb..cd33084c7860 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -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;