Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66bf9321 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: dapm: Only lock CODEC for I/O if not using regmap 



If we do use regmap then regmap will take care of things for us. We
actually already have this check at a higher level for the current
users but this makes sure we do the right thing in the future too if
we need to.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 96acc357

sound/soc/soc-dapm.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val) 


static inline void soc_widget_lock(struct snd_soc_dapm_widget *w)

{

	if (w->codec)

	if (w->codec && !w->codec->using_regmap)

		mutex_lock(&w->codec->mutex);

	else if (w->platform)

		mutex_lock(&w->platform->mutex);
@@ -216,7 +216,7 @@ static inline void soc_widget_lock(struct snd_soc_dapm_widget *w) 


static inline void soc_widget_unlock(struct snd_soc_dapm_widget *w)

{

	if (w->codec)

	if (w->codec && !w->codec->using_regmap)

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

	else if (w->platform)

		mutex_unlock(&w->platform->mutex);