[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1bc74ff3eeb249ab98674bb31e92abee566bb3d5.1475144721.git.jslaby@suse.cz>
Date: Thu, 29 Sep 2016 12:24:25 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 029/119] Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 47af45d684b5f3ae000ad448db02ce4f13f73273 upstream.
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@...ff.to>
Tested-by: Bruno Wolff III <bruno@...ff.to>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@...il.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
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 7ecca05bd7a5..09da61eb07fa 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) {
--
2.10.0
Powered by blists - more mailing lists