diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-05-24 11:50:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-26 22:11:16 +0800 |
| commit | 5a195b445020f6042c2096e5eb63ef900e7871ea (patch) | |
| tree | 3e588e6c61b629b5271f8aa85c70a839b60544b4 /sound | |
| parent | 92505299a131b47992d318f2875d5629ac870d87 (diff) | |
| download | linux-3.10-5a195b445020f6042c2096e5eb63ef900e7871ea.tar.gz linux-3.10-5a195b445020f6042c2096e5eb63ef900e7871ea.tar.bz2 linux-3.10-5a195b445020f6042c2096e5eb63ef900e7871ea.zip | |
ASoC: wm8731: fix wm8731_check_osc() connected condition
The crystal oscillator is only enabled if the WM8731_SYSCLK_XTAL master clock
is specified. Fix the connected() struct snd_soc_dapm_route function to take
this into account. Oscillator is not enabled on machine that need it otherwise.
Machine drivers have to make sure that they use the proper SYSCLK value.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 6dec7cee2cb..2dc964b55e4 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -198,7 +198,7 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source, { struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(source->codec); - return wm8731->sysclk_type == WM8731_SYSCLK_MCLK; + return wm8731->sysclk_type == WM8731_SYSCLK_XTAL; } static const struct snd_soc_dapm_route wm8731_intercon[] = { |