[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1392655903-24537-7-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Date: Mon, 17 Feb 2014 16:51:34 +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 06/15] ASoC: wm8994: 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/wm8994.c | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index b9be9cb..4788c4e 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2552,38 +2552,46 @@ int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode)
switch (mode) {
case WM8994_VMID_NORMAL:
+ mutex_lock(&codec->dapm.card->dapm_mutex);
+
if (wm8994->hubs.lineout1_se) {
- snd_soc_dapm_disable_pin(&codec->dapm,
- "LINEOUT1N Driver");
- snd_soc_dapm_disable_pin(&codec->dapm,
- "LINEOUT1P Driver");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm,
+ "LINEOUT1N Driver");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm,
+ "LINEOUT1P Driver");
}
if (wm8994->hubs.lineout2_se) {
- snd_soc_dapm_disable_pin(&codec->dapm,
- "LINEOUT2N Driver");
- snd_soc_dapm_disable_pin(&codec->dapm,
- "LINEOUT2P Driver");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm,
+ "LINEOUT2N Driver");
+ snd_soc_dapm_disable_pin_locked(&codec->dapm,
+ "LINEOUT2P Driver");
}
+ mutex_unlock(&codec->dapm.card->dapm_mutex);
+
/* Do the sync with the old mode to allow it to clean up */
snd_soc_dapm_sync(&codec->dapm);
wm8994->vmid_mode = mode;
break;
case WM8994_VMID_FORCE:
+ mutex_lock(&codec->dapm.card->dapm_mutex);
+
if (wm8994->hubs.lineout1_se) {
- snd_soc_dapm_force_enable_pin(&codec->dapm,
- "LINEOUT1N Driver");
- snd_soc_dapm_force_enable_pin(&codec->dapm,
- "LINEOUT1P Driver");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "LINEOUT1N Driver");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "LINEOUT1P Driver");
}
if (wm8994->hubs.lineout2_se) {
- snd_soc_dapm_force_enable_pin(&codec->dapm,
- "LINEOUT2N Driver");
- snd_soc_dapm_force_enable_pin(&codec->dapm,
- "LINEOUT2P Driver");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "LINEOUT2N Driver");
+ snd_soc_dapm_force_enable_pin_locked(&codec->dapm,
+ "LINEOUT2P Driver");
}
+ mutex_unlock(&codec->dapm.card->dapm_mutex);
+
wm8994->vmid_mode = mode;
snd_soc_dapm_sync(&codec->dapm);
break;
--
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