UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

This commit is contained in:
Mark Brown 2013-06-10 10:28:50 +01:00
parent 97a47ce9d2 2894770ec1
commit 4351ac5b9f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,14 +187,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
break;
}
if (found)
snd_soc_dapm_sync(widget->dapm);
}
ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
mutex_unlock(&widget->codec->mutex);
if (found)
snd_soc_dapm_sync(widget->dapm);
ret = snd_soc_update_bits_locked(widget->codec, reg, val_mask, val);
return ret;
}