From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 18 Mar 2010 13:11:53 +0000 (+0100)
Subject: HID: simplify error handling in hid_input_report()
X-Git-Tag: v2.6.35-rc1~454^2~4^4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f77e347bd44e3640bdc56003b7402c63ddb1241d;p=pandora-kernel.git

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>
---

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c49aaa21e1a7..86cb2c47e9ea 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -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");
+	kfree(buf);
 
+nomem:
 	report = hid_get_report(report_enum, data);
 
-	if (!report) {
-		kfree(buf);
+	if (!report)
 		return -1;
-	}
-
-	kfree(buf);
 
-nomem:
 	if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
 		ret = hdrv->raw_event(hid, report, data, size);
 		if (ret != 0)