Input: i8042 - force synchronous probing of PNP drivers

We rely on the result of scanning PNP bus for keyboard and mouse devices to
decide whether we should continue initialization of i8042 driver or not, so
the probes can not be asynchronous.

Also, it is not a good idea to unbind either of the PNP devices while i8042
is running, so let's disable bind/unbind for the PNP drivers through sysfs
and rely on i8042 cleaning after itself properly. User can still unbind and
rebind entire i8042 and that will take care of PNP drivers as well.

Reviewed-by: Luis R. Rodriguez <mgrof@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 21e134798ba396ea4fac022c829f32661abd352d..a4592ebf9a1d5ea5a11e8ed24d85bd36c0d76e50 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -910,6 +910,10 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
        .name           = "i8042 kbd",
        .id_table       = pnp_kbd_devids,
        .probe          = i8042_pnp_kbd_probe,
+       .driver         = {
+               .probe_type = PROBE_FORCE_SYNCHRONOUS,
+               .suppress_bind_attrs = true,
+       },
 };
 
 static struct pnp_device_id pnp_aux_devids[] = {
@@ -932,6 +936,10 @@ static struct pnp_driver i8042_pnp_aux_driver = {
        .name           = "i8042 aux",
        .id_table       = pnp_aux_devids,
        .probe          = i8042_pnp_aux_probe,
+       .driver         = {
+               .probe_type = PROBE_FORCE_SYNCHRONOUS,
+               .suppress_bind_attrs = true,
+       },
 };
 
 static void i8042_pnp_exit(void)