diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-08-16 17:38:54 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-08-19 10:08:49 -0700 |
| commit | 47af45d684b5f3ae000ad448db02ce4f13f73273 (patch) | |
| tree | 91cff56382a4be7ad86670f11800426a9b6c4313 /drivers/input/serio/i8042.c | |
| parent | Input: silead - remove some dead code (diff) | |
| download | linux-dev-47af45d684b5f3ae000ad448db02ce4f13f73273.tar.xz linux-dev-47af45d684b5f3ae000ad448db02ce4f13f73273.zip | |
Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
The commit 4097461897df ("Input: i8042 - break load dependency ...")
correctly set up ps2_cmd_mutex pointer for the KBD port but forgot to do
the same for AUX port(s), which results in communication on KBD and AUX
ports to clash with each other.
Fixes: 4097461897df ("Input: i8042 - break load dependency ...")
Reported-by: Bruno Wolff III <bruno@wolff.to>
Tested-by: Bruno Wolff III <bruno@wolff.to>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio/i8042.c')
| -rw-r--r-- | drivers/input/serio/i8042.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index b4d34086e73f..405252a884dd 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1305,6 +1305,7 @@ static int __init i8042_create_aux_port(int idx) serio->write = i8042_aux_write; serio->start = i8042_start; serio->stop = i8042_stop; + serio->ps2_cmd_mutex = &i8042_mutex; serio->port_data = port; serio->dev.parent = &i8042_platform_device->dev; if (idx < 0) { |