diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 20:53:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 20:53:06 +0200 |
| commit | 58c59bc997d86593f0bea41845885917cf304d22 (patch) | |
| tree | 6828cd2526c9f4a86955389b26314819ea891213 /drivers/hid | |
| parent | Merge tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Revert "HID: hid-logitech-dj: querying_devices was never set" (diff) | |
| download | linux-58c59bc997d86593f0bea41845885917cf304d22.tar.xz linux-58c59bc997d86593f0bea41845885917cf304d22.zip | |
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/hid')
| -rw-r--r-- | drivers/hid/hid-logitech-dj.c | 2 |
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; |