35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From 47af45d684b5f3ae000ad448db02ce4f13f73273 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
|
||
|
|
Date: Tue, 16 Aug 2016 17:38:54 -0700
|
||
|
|
Subject: 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>
|
||
|
|
---
|
||
|
|
drivers/input/serio/i8042.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
|
||
|
|
index b4d3408..405252a 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) {
|
||
|
|
--
|
||
|
|
cgit v0.12
|
||
|
|
|