From 5a6caa06df6a432849cb5c247060d2ae06742fca Mon Sep 17 00:00:00 2001
From: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Date: Thu, 5 Apr 2007 16:57:41 +0200
Subject: [PATCH] --- yaml --- r: 56153 b: refs/heads/master c:
 208eee2a9db7e70109583e3481371967cd1d4764 h: refs/heads/master i:   56151:
 615d92455521b7097a0a2de8a748ac9c4a75a1a9 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/core/pcm_native.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a1612a0c779a..bbfe523900ae 100644
--- 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
index 42a039cc50a8..a96733a5beb8 100644
--- 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;