HID: usbhid: fix improper return value
Function hid_post_reset() should return negative error codes on failures. However, in its implementation, it incorrectly returns 1. This patch fixes the bug, returning proper error codes on failures. Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
2ae3986b84
Коммит
c60fa555b1
|
@ -1459,7 +1459,7 @@ static int hid_post_reset(struct usb_interface *intf)
|
|||
rdesc = kmalloc(hid->dev_rsize, GFP_KERNEL);
|
||||
if (!rdesc) {
|
||||
dbg_hid("couldn't allocate rdesc memory (post_reset)\n");
|
||||
return 1;
|
||||
return -ENOMEM;
|
||||
}
|
||||
status = hid_get_class_descriptor(dev,
|
||||
interface->desc.bInterfaceNumber,
|
||||
|
@ -1467,13 +1467,13 @@ static int hid_post_reset(struct usb_interface *intf)
|
|||
if (status < 0) {
|
||||
dbg_hid("reading report descriptor failed (post_reset)\n");
|
||||
kfree(rdesc);
|
||||
return 1;
|
||||
return status;
|
||||
}
|
||||
status = memcmp(rdesc, hid->dev_rdesc, hid->dev_rsize);
|
||||
kfree(rdesc);
|
||||
if (status != 0) {
|
||||
dbg_hid("report descriptor changed\n");
|
||||
return 1;
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
/* No need to do another reset or clear a halted endpoint */
|
||||
|
|
Загрузка…
Ссылка в новой задаче