From 7cec5ad52cd718fced3f919e7427e35ac3c2322a Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 3 Jul 2006 00:25:08 -0700
Subject: [PATCH] --- yaml --- r: 31819 b: refs/heads/master c:
 3aceafc1e2596f1c2c4e053126561f00b68e3a1a h: refs/heads/master i:   31817:
 91a252d5f1bd50a50ebdfd834a5500e6187aa40e   31815:
 e89b6d5bae3c74aa4abb3c0a74d2fe6bbb822b41 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/serio/libps2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27d21826e69f..985b968bae6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f20dc5f7c1adf1c4b68b7672d6f2002cb824e636
+refs/heads/master: 3aceafc1e2596f1c2c4e053126561f00b68e3a1a
diff --git a/trunk/drivers/input/serio/libps2.c b/trunk/drivers/input/serio/libps2.c
index 79c97f94bcbd..61a6f977846f 100644
--- a/trunk/drivers/input/serio/libps2.c
+++ b/trunk/drivers/input/serio/libps2.c
@@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
 		return -1;
 	}
 
-	mutex_lock(&ps2dev->cmd_mutex);
+	mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING);
 
 	serio_pause_rx(ps2dev->serio);
 	ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0;