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

Commit f77e347b authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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: default avatarJiri Kosina <jkosina@suse.cz>
parent 1caea61e

drivers/hid/hid-core.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -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);

	buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);





	if (!buf) {

	if (!buf)

		report = hid_get_report(report_enum, data);

		goto nomem;

		goto nomem;

	}





	/* dump the report */

	/* dump the report */

	snprintf(buf, HID_DEBUG_BUFSIZE - 1,

	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, buf);

	}

	}

	hid_debug_event(hid, "\n");

	hid_debug_event(hid, "\n");

	kfree(buf);





nomem:

	report = hid_get_report(report_enum, data);

	report = hid_get_report(report_enum, data);





	if (!report) {

	if (!report)

		kfree(buf);

		return -1;

		return -1;

	}





	kfree(buf);



nomem:

	if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {

	if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {

		ret = hdrv->raw_event(hid, report, data, size);

		ret = hdrv->raw_event(hid, report, data, size);

		if (ret != 0)

		if (ret != 0)