Commit 19a0b6d7 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.11/i2c-hid' into for-linus 

- error reporting fix from Coiby Xu
parents e77bc7dc afdd34c5

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

+4 −1
Original line number Diff line number Diff line
@@ -1106,8 +1106,11 @@ static int i2c_hid_probe(struct i2c_client *client, 
	}



	ret = i2c_hid_fetch_hid_descriptor(ihid);

	if (ret < 0)

	if (ret < 0) {

		dev_err(&client->dev,

			"Failed to fetch the HID Descriptor\n");

		goto err_regulator;

	}



	ret = i2c_hid_init_irq(client);

	if (ret < 0)