---

yaml --- r: 56153 b: refs/heads/master c: 208eee2 h: refs/heads/master i: 56151: 615d924 v: v3
git-mirror · May 11, 2007 · 5a6caa0 · 5a6caa0
1 parent d5c3c6e
commit 5a6caa0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b97eb45f2edca51250b6c1e3142801f069245fe
+refs/heads/master: 208eee2a9db7e70109583e3481371967cd1d4764
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
@@ -718,7 +718,8 @@ static int snd_pcm_action_group(struct action_ops *ops,
 
 	snd_pcm_group_for_each_entry(s, substream) {
 		if (do_lock && s != substream)
-			spin_lock(&s->self_group.lock);
+			spin_lock_nested(&s->self_group.lock,
+					 SINGLE_DEPTH_NESTING);
 		res = ops->pre_action(s, state);
 		if (res < 0)
 			goto _unlock;