lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hid-input/battery: remove apparently redundant kmalloc

Browse Source 
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
This commit is contained in:
Jeremy Fitzhardinge
2011-12-02 10:04:04 -08:00
parent c5a92aa3eb
commit ef5251993c
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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