Skip to content

L
linux
Commit 1341c586 authored by Jiri Kosina's avatar Jiri Kosina
Browse files
Options

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

- prefer async probing in i2c-hid even if built-in
parents 1142a12c eafb2203
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
drivers/hid/i2c-hid/i2c-hid-core.c
View file @ 1341c586
...@@ -1268,6 +1268,7 @@ static struct i2c_driver i2c_hid_driver = { ...@@ -1268,6 +1268,7 @@ static struct i2c_driver i2c_hid_driver = {
.driver = { .driver = {
.name = "i2c_hid", .name = "i2c_hid",
.pm = &i2c_hid_pm, .pm = &i2c_hid_pm,
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
.acpi_match_table = ACPI_PTR(i2c_hid_acpi_match), .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match),
.of_match_table = of_match_ptr(i2c_hid_of_match), .of_match_table = of_match_ptr(i2c_hid_of_match),
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7