diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:39:08 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:39:08 +0200 |
| commit | 1341c58615e914d500fe0354b7212f7b188397d7 (patch) | |
| tree | 5052e18b027107f8f85cd57eebe89d78f77fca47 /drivers/hid | |
| parent | 1142a12ca90cce0fb2be26092be5df832f40fc9c (diff) | |
| parent | eafb2203626aedb599cc80aadcba533c917b53b0 (diff) | |
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.c | 1 |
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), }, |