HID: simplify error handling in hid_input_report()
The handling of failed debugging buffer allocation got overly complicated. We simply want to skip the debugging code if allocation fails and go on with event processing. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
1caea61eda
Коммит
f77e347bd4
|
@ -1091,10 +1091,8 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
|
|||
|
||||
buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);
|
||||
|
||||
if (!buf) {
|
||||
report = hid_get_report(report_enum, data);
|
||||
if (!buf)
|
||||
goto nomem;
|
||||
}
|
||||
|
||||
/* dump the report */
|
||||
snprintf(buf, HID_DEBUG_BUFSIZE - 1,
|
||||
|
@ -1107,17 +1105,14 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
|
|||
hid_debug_event(hid, buf);
|
||||
}
|
||||
hid_debug_event(hid, "\n");
|
||||
|
||||
report = hid_get_report(report_enum, data);
|
||||
|
||||
if (!report) {
|
||||
kfree(buf);
|
||||
return -1;
|
||||
}
|
||||
|
||||
kfree(buf);
|
||||
|
||||
nomem:
|
||||
report = hid_get_report(report_enum, data);
|
||||
|
||||
if (!report)
|
||||
return -1;
|
||||
|
||||
if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
|
||||
ret = hdrv->raw_event(hid, report, data, size);
|
||||
if (ret != 0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче