hid-input/battery: remove apparently redundant kmalloc
Jeremy Fitzhardinge [Fri, 2 Dec 2011 18:04:04 +0000 (10:04 -0800)]
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>

drivers/hid/hid-input.c

index 8fac47c..b108ce7 100644 (file)
@@ -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;
 }