Commit aa69d697 authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: i2c-hid: Switch i2c_hid_parse() to goto style error handling 



Switch i2c_hid_parse() to goto style error handling.

This is a preparation patch for removing the need for
I2C_HID_QUIRK_NO_IRQ_AFTER_RESET by making i2c-hid behave
more like Windows.

Note this changes the descriptor read error path to propagate
the actual i2c_hid_read_register() error code (which is always
negative) instead of hardcoding a -EIO return.

Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 96d3098d

drivers/hid/i2c-hid/i2c-hid-core.c

+6 −8
Original line number Diff line number Diff line
@@ -773,25 +773,23 @@ static int i2c_hid_parse(struct hid_device *hid) 
					    rdesc, rsize);

		if (ret) {

			hid_err(hid, "reading report descriptor failed\n");

			kfree(rdesc);

			return -EIO;

			goto out;

		}

	}



	i2c_hid_dbg(ihid, "Report Descriptor: %*ph\n", rsize, rdesc);



	ret = hid_parse_report(hid, rdesc, rsize);

	if (ret)

		dbg_hid("parsing report descriptor failed\n");



out:

	if (!use_override)

		kfree(rdesc);



	if (ret) {

		dbg_hid("parsing report descriptor failed\n");

	return ret;

}



	return 0;

}



static int i2c_hid_start(struct hid_device *hid)

{

	struct i2c_client *client = hid->driver_data;