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

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

- prefer async probing in i2c-hid even if built-in
parents 1142a12c eafb2203

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

+1 −0
Original line number Diff line number Diff line
@@ -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),

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE