diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
tree | f245dd77a3dede97a80f8369d984334b56220752 /drivers/hid/usbhid/hid-core.c | |
parent | fa2bd30159499f441125495ba8d9d57f646ea42a (diff) | |
parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 (diff) |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/usbhid/hid-core.c')
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index dedd8e4e5c6d..8e0c4bf94ebc 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1415,20 +1415,20 @@ static int hid_post_reset(struct usb_interface *intf) * configuration descriptors passed, we already know that * the size of the HID report descriptor has not changed. */ - rdesc = kmalloc(hid->rsize, GFP_KERNEL); + rdesc = kmalloc(hid->dev_rsize, GFP_KERNEL); if (!rdesc) { dbg_hid("couldn't allocate rdesc memory (post_reset)\n"); return 1; } status = hid_get_class_descriptor(dev, interface->desc.bInterfaceNumber, - HID_DT_REPORT, rdesc, hid->rsize); + HID_DT_REPORT, rdesc, hid->dev_rsize); if (status < 0) { dbg_hid("reading report descriptor failed (post_reset)\n"); kfree(rdesc); return 1; } - status = memcmp(rdesc, hid->rdesc, hid->rsize); + status = memcmp(rdesc, hid->dev_rdesc, hid->dev_rsize); kfree(rdesc); if (status != 0) { dbg_hid("report descriptor changed\n"); |