* [PATCH 1/1 v2] input: usbhid: fix improper return value
@ 2016-12-05 11:37 Pan Bian
2016-12-09 12:47 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Pan Bian @ 2016-12-05 11:37 UTC (permalink / raw)
To: Oliver Neukum, Jiri Kosina, Benjamin Tissoires, linux-usb, linux-input
Cc: linux-kernel, Pan Bian
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>
---
drivers/hid/usbhid/hid-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index ae83af6..333108e 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -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 */
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH 1/1 v2] input: usbhid: fix improper return value
2016-12-05 11:37 [PATCH 1/1 v2] input: usbhid: fix improper return value Pan Bian
@ 2016-12-09 12:47 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2016-12-09 12:47 UTC (permalink / raw)
To: Pan Bian
Cc: Oliver Neukum, Benjamin Tissoires, linux-usb, linux-input, linux-kernel
On Mon, 5 Dec 2016, Pan Bian wrote:
> 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.
Applied to for-4.10/upstream. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-09 12:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-05 11:37 [PATCH 1/1 v2] input: usbhid: fix improper return value Pan Bian
2016-12-09 12:47 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®