[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1392655903-24537-4-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Date: Mon, 17 Feb 2014 16:51:31 +0000
From: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
To: broonie@...nel.org
Cc: myungjoo.ham@...sung.com, cw00.choi@...sung.com,
dmitry.torokhov@...il.com, lgirdwood@...il.com, lars@...afoo.de,
peter.ujfalusi@...com, jarkko.nikula@...mer.com,
eric.y.miao@...il.com, haojian.zhuang@...il.com,
linux-kernel@...r.kernel.org, patches@...nsource.wolfsonmicro.com,
alsa-devel@...a-project.org, linux@....linux.org.uk
Subject: [PATCH 03/15] ASoC: adav80x: Update locking around use of DAPM pin API
The pin updates in this driver look like they are intended to be done
atomically, update to do so.
Signed-off-by: Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
---
sound/soc/codecs/adav80x.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index f78b27a..aacb2c03 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -600,15 +600,21 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
adav80x->sysclk_pd[clk_id] = false;
}
+ mutex_lock(&codec->dapm.card->dapm_mutex);
+
if (adav80x->sysclk_pd[0])
- snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm, "PLL1");
else
- snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "PLL1");
if (adav80x->sysclk_pd[1] || adav80x->sysclk_pd[2])
- snd_soc_dapm_disable_pin(&codec->dapm, "PLL2");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm, "PLL2");
else
- snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "PLL2");
+
+ mutex_unlock(&codec->dapm.card->dapm_mutex);
snd_soc_dapm_sync(&codec->dapm);
}
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists