Skip to content

Commit

Permalink
ASoC: tlv320aic3x: Remove deadlock from snd_soc_dapm_put_volsw_aic3x()
Browse files Browse the repository at this point in the history
When calling snd_soc_dapm_sync(), it eventually tries to lock the same mutex
already locked in snd_soc_dapm_put_volsw_aic3x() and a deadlock occurs. By
moving the mutex unlock to just before snd_soc_dapm_sync(), this deadlock is
prevented. This problem was introduced in Linux 3.5

Signed-off-by: Andreas Irestål <Andreas.Irestal@axis.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Andreas Irestål authored and Mark Brown committed Jun 7, 2013
1 parent d683b96 commit 2894770
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/soc/codecs/tlv320aic3x.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,

break;
}

if (found)
snd_soc_dapm_sync(widget->dapm);
}

ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);

mutex_unlock(&widget->codec->mutex);

if (found)
snd_soc_dapm_sync(widget->dapm);

ret = snd_soc_update_bits_locked(widget->codec, reg, val_mask, val);
return ret;
}

Expand Down

0 comments on commit 2894770

Please sign in to comment.