aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-10-15 20:39:08 +0200
committerJiri Kosina <jkosina@suse.cz>2020-10-15 20:39:08 +0200
commit1341c58615e914d500fe0354b7212f7b188397d7 (patch)
tree5052e18b027107f8f85cd57eebe89d78f77fca47 /drivers/hid
parentMerge branch 'for-5.10/cp2112' into for-linus (diff)
parentHID: i2c-hid: Prefer asynchronous probe (diff)
downloadlinux-dev-1341c58615e914d500fe0354b7212f7b188397d7.tar.xz
linux-dev-1341c58615e914d500fe0354b7212f7b188397d7.zip
Merge branch 'for-5.10/i2c-hid' into for-linus
- prefer async probing in i2c-hid even if built-in
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/i2c-hid/i2c-hid-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index dbd04492825d..d053b86d0e2e 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -1268,6 +1268,7 @@ static struct i2c_driver i2c_hid_driver = {
.driver = {
.name = "i2c_hid",
.pm = &i2c_hid_pm,
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.acpi_match_table = ACPI_PTR(i2c_hid_acpi_match),
.of_match_table = of_match_ptr(i2c_hid_of_match),
},