Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60fa555 authored by Pan Bian's avatar Pan Bian Committed by Jiri Kosina
Browse files

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: default avatarPan Bian <bianpan2016@163.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 2ae3986b

drivers/hid/usbhid/hid-core.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */