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

Commit a3789a17 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

HID: Hoist assigns from ifs 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 16ee4cc8

drivers/hid/hid-core.c

+13 −6
Original line number Original line Diff line number Diff line
@@ -61,7 +61,8 @@ struct hid_report *hid_register_report(struct hid_device *device, unsigned type, 
	if (report_enum->report_id_hash[id])

	if (report_enum->report_id_hash[id])

		return report_enum->report_id_hash[id];

		return report_enum->report_id_hash[id];





	if (!(report = kzalloc(sizeof(struct hid_report), GFP_KERNEL)))

	report = kzalloc(sizeof(struct hid_report), GFP_KERNEL);

	if (!report)

		return NULL;

		return NULL;





	if (id != 0)

	if (id != 0)
@@ -92,8 +93,11 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned 
		return NULL;

		return NULL;

	}

	}





	if (!(field = kzalloc(sizeof(struct hid_field) + usages * sizeof(struct hid_usage)

	field = kzalloc((sizeof(struct hid_field) +

		+ values * sizeof(unsigned), GFP_KERNEL))) return NULL;

			 usages * sizeof(struct hid_usage) +

			 values * sizeof(unsigned)), GFP_KERNEL);

	if (!field)

		return NULL;





	field->index = report->maxfield++;

	field->index = report->maxfield++;

	report->field[field->index] = field;

	report->field[field->index] = field;
@@ -211,7 +215,8 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign 
	unsigned offset;

	unsigned offset;

	int i;

	int i;





	if (!(report = hid_register_report(parser->device, report_type, parser->global.report_id))) {

	report = hid_register_report(parser->device, report_type, parser->global.report_id);

	if (!report) {

		dbg_hid("hid_register_report failed\n");

		dbg_hid("hid_register_report failed\n");

		return -1;

		return -1;

	}

	}
@@ -229,7 +234,8 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign 




	usages = max_t(int, parser->local.usage_index, parser->global.report_count);

	usages = max_t(int, parser->local.usage_index, parser->global.report_count);





	if ((field = hid_register_field(report, usages, parser->global.report_count)) == NULL)

	field = hid_register_field(report, usages, parser->global.report_count);

	if (!field)

		return 0;

		return 0;





	field->physical = hid_lookup_collection(parser, HID_COLLECTION_PHYSICAL);

	field->physical = hid_lookup_collection(parser, HID_COLLECTION_PHYSICAL);
@@ -891,7 +897,8 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, 
	__s32 max = field->logical_maximum;

	__s32 max = field->logical_maximum;

	__s32 *value;

	__s32 *value;





	if (!(value = kmalloc(sizeof(__s32) * count, GFP_ATOMIC)))

	value = kmalloc(sizeof(__s32) * count, GFP_ATOMIC);

	if (!value)

		return;

		return;





	for (n = 0; n < count; n++) {

	for (n = 0; n < count; n++) {