---

yaml --- r: 31819 b: refs/heads/master c: 3aceafc h: refs/heads/master i: 31817: 91a252d 31815: e89b6d5 v: v3
git-mirror · Jul 3, 2006 · 7cec5ad · 7cec5ad
1 parent 55c02a4
commit 7cec5ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;