summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-12-16 13:42:01 +0300
committerJiri Kosina <jkosina@suse.cz>2020-12-16 13:42:01 +0300
commit19a0b6d79c970680cdaa3054728c9a64445f2310 (patch)
tree40e643f5ff1ae6efe303453b6b6a311b600e4524 /drivers/hid
parente77bc7dc9af0ec53996367b2053dfafee83b7edb (diff)
parentafdd34c5fa4028976ee5103ac499edbddedc813e (diff)
downloadlinux-19a0b6d79c970680cdaa3054728c9a64445f2310.tar.xz
Merge branch 'for-5.11/i2c-hid' into for-linus
- error reporting fix from Coiby Xu
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/i2c-hid/i2c-hid-core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index aeff1ffb0c8b..bfe716d7ea44 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -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)