From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Fri, 2 Dec 2011 18:04:04 +0000 (-0800)
Subject: hid-input/battery: remove apparently redundant kmalloc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef5251993c3597a88b893fe22ee830092dff35f9;p=linux-beck.git

hid-input/battery: remove apparently redundant kmalloc

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
---

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 8fac47cf42f1..b108ce71583f 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -287,7 +287,7 @@ static int hidinput_get_battery_property(struct power_supply *psy,
 	struct hid_device *dev = container_of(psy, struct hid_device, battery);
 	int ret = 0;
 	int ret_rep;
-	__u8 *buf = NULL;
+	__u8 buf[2] = {};
 	unsigned char report_number = dev->battery_report_id;
 
 	switch (prop) {
@@ -297,14 +297,8 @@ static int hidinput_get_battery_property(struct power_supply *psy,
 		break;
 
 	case POWER_SUPPLY_PROP_CAPACITY:
-		buf = kmalloc(2 * sizeof(__u8), GFP_KERNEL);
-		if (!buf) {
-			ret = -ENOMEM;
-			break;
-		}
-
-		memset(buf, 0, sizeof(buf));
-		ret_rep = dev->hid_get_raw_report(dev, report_number, buf, sizeof(buf), HID_FEATURE_REPORT);
+		ret_rep = dev->hid_get_raw_report(dev, report_number,
+						  buf, sizeof(buf), HID_FEATURE_REPORT);
 		if (ret_rep != 2) {
 			ret = -EINVAL;
 			break;
@@ -329,9 +323,6 @@ static int hidinput_get_battery_property(struct power_supply *psy,
 		break;
 	}
 
-	if (buf) {
-		kfree(buf);
-	}
 	return ret;
 }