diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
| commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
| tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /sound/core | |
| parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff) | |
| parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 (diff) | |
| download | linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.gz linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.bz2 linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.zip | |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 03e1e920ab13..2f7ad10ee7c3 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -797,16 +797,15 @@ static int snd_pcm_action_group(struct action_ops *ops, { struct snd_pcm_substream *s = NULL; struct snd_pcm_substream *s1; - int res = 0; + int res = 0, depth = 1; snd_pcm_group_for_each_entry(s, substream) { if (do_lock && s != substream) { if (s->pcm->nonatomic) - mutex_lock_nested(&s->self_group.mutex, - SINGLE_DEPTH_NESTING); + mutex_lock_nested(&s->self_group.mutex, depth); else - spin_lock_nested(&s->self_group.lock, - SINGLE_DEPTH_NESTING); + spin_lock_nested(&s->self_group.lock, depth); + depth++; } res = ops->pre_action(s, state); if (res < 0) @@ -922,8 +921,7 @@ static int snd_pcm_action_lock_mutex(struct action_ops *ops, down_read(&snd_pcm_link_rwsem); if (snd_pcm_stream_linked(substream)) { mutex_lock(&substream->group->mutex); - mutex_lock_nested(&substream->self_group.mutex, - SINGLE_DEPTH_NESTING); + mutex_lock(&substream->self_group.mutex); res = snd_pcm_action_group(ops, substream, state, 1); mutex_unlock(&substream->self_group.mutex); mutex_unlock(&substream->group->mutex); |