diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-08-16 17:38:54 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-31 22:05:44 -0400 |
| commit | 61f53d4a977b40f6c0673c4ee6587fc825ec9e44 (patch) | |
| tree | 342637da50aa7a68d537546f1a24e88b6390c5fd /drivers | |
| parent | 0a47a53081df72950f8614c6b9e8e830e80a3ac1 (diff) | |
| download | lwn-61f53d4a977b40f6c0673c4ee6587fc825ec9e44.tar.gz lwn-61f53d4a977b40f6c0673c4ee6587fc825ec9e44.zip | |
Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
[ Upstream commit 47af45d684b5f3ae000ad448db02ce4f13f73273 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers')
| -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 1889f0a6c4ca..1e25a0616ca0 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1258,6 +1258,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) { |