ASoC: tlv320aic3x: Remove deadlock from snd_soc_dapm_put_volsw_aic3x()
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>
This commit is contained in:
parent
d683b96b07
commit
2894770ec1
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue