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

Commit ef525199 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

hid-input/battery: remove apparently redundant kmalloc 



Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@goop.org>
parent c5a92aa3

drivers/hid/hid-input.c

+3 −12
Original line number Diff line number Diff line
@@ -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;

}