FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-30 13:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2016-01-11 13:54:29 +00:00
commit 804c0a9569
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/arizona.c
View File

@ -1494,6 +1494,9 @@ static int arizona_startup(struct snd_pcm_substream *substream,
const struct snd_pcm_hw_constraint_list *constraint; const struct snd_pcm_hw_constraint_list *constraint;
unsigned int base_rate; unsigned int base_rate;
if (!substream->runtime)
return 0;
switch (dai_priv->clk) { switch (dai_priv->clk) {
case ARIZONA_CLK_SYSCLK: case ARIZONA_CLK_SYSCLK:
base_rate = priv->sysclk; base_rate = priv->sysclk;

10
sound/soc/codecs/wm5110.c
View File

@ -437,18 +437,17 @@ static int wm5110_in_pga_get(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct snd_soc_card *card = dapm->card;
int ret; int ret;
/* /*
* PGA Volume is also used as part of the enable sequence, so * PGA Volume is also used as part of the enable sequence, so
* usage of it should be avoided whilst that is running. * usage of it should be avoided whilst that is running.
*/ */
mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); snd_soc_dapm_mutex_lock(dapm);
ret = snd_soc_get_volsw_range(kcontrol, ucontrol); ret = snd_soc_get_volsw_range(kcontrol, ucontrol);
mutex_unlock(&card->dapm_mutex); snd_soc_dapm_mutex_unlock(dapm);
return ret; return ret;
} }
@ -458,18 +457,17 @@ static int wm5110_in_pga_put(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct snd_soc_card *card = dapm->card;
int ret; int ret;
/* /*
* PGA Volume is also used as part of the enable sequence, so * PGA Volume is also used as part of the enable sequence, so
* usage of it should be avoided whilst that is running. * usage of it should be avoided whilst that is running.
*/ */
mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); snd_soc_dapm_mutex_lock(dapm);
ret = snd_soc_put_volsw_range(kcontrol, ucontrol); ret = snd_soc_put_volsw_range(kcontrol, ucontrol);
mutex_unlock(&card->dapm_mutex); snd_soc_dapm_mutex_unlock(dapm);
return ret; return ret;
} }