| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1392655903-24537-12-git-send-email-ckeepax@opensource.wolfsonmicro.com> Date: Mon, 17 Feb 2014 16:51:39 +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 11/15] ASoC: omap: rx51: 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/omap/rx51.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 611179c..51f1ae6 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -74,22 +74,26 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm) break; } + mutex_lock(&dapm->card->dapm_mutex); + if (rx51_spk_func) - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); + snd_soc_dapm_enable_pin_locked(dapm, "Ext Spk"); else - snd_soc_dapm_disable_pin(dapm, "Ext Spk"); + snd_soc_dapm_disable_pin_locked(dapm, "Ext Spk"); if (rx51_dmic_func) - snd_soc_dapm_enable_pin(dapm, "DMic"); + snd_soc_dapm_enable_pin_locked(dapm, "DMic"); else - snd_soc_dapm_disable_pin(dapm, "DMic"); + snd_soc_dapm_disable_pin_locked(dapm, "DMic"); if (hp) - snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); + snd_soc_dapm_enable_pin_locked(dapm, "Headphone Jack"); else - snd_soc_dapm_disable_pin(dapm, "Headphone Jack"); + snd_soc_dapm_disable_pin_locked(dapm, "Headphone Jack"); if (hs) - snd_soc_dapm_enable_pin(dapm, "HS Mic"); + snd_soc_dapm_enable_pin_locked(dapm, "HS Mic"); else - snd_soc_dapm_disable_pin(dapm, "HS Mic"); + snd_soc_dapm_disable_pin_locked(dapm, "HS Mic"); + + mutex_unlock(&dapm->card->dapm_mutex); gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout); -- 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