diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 06:57:43 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 06:57:43 -0500 |
| commit | ab4e57446ff2e0a5c154cb703595d574130dc919 (patch) | |
| tree | 2527773606a07b3f7af0bd2c0e6f692d1f340d32 /sound/soc/codecs | |
| parent | 2a9ae13a2641373d06e24f866c7427644c39bfea (diff) | |
| parent | d6f443ae4c1d54379ad5953d7bcb89a63387184d (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8961.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index a0bb972420b3..6b22ef200e20 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c | |||
| @@ -710,7 +710,7 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream, | |||
| 710 | if (fs <= 24000) | 710 | if (fs <= 24000) |
| 711 | reg |= WM8961_DACSLOPE; | 711 | reg |= WM8961_DACSLOPE; |
| 712 | else | 712 | else |
| 713 | reg &= WM8961_DACSLOPE; | 713 | reg &= ~WM8961_DACSLOPE; |
| 714 | snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg); | 714 | snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg); |
| 715 | 715 | ||
| 716 | return 0; | 716 | return 0; |
| @@ -735,7 +735,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id, | |||
| 735 | freq /= 2; | 735 | freq /= 2; |
| 736 | } else { | 736 | } else { |
| 737 | dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq); | 737 | dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq); |
| 738 | reg &= WM8961_MCLKDIV; | 738 | reg &= ~WM8961_MCLKDIV; |
| 739 | } | 739 | } |
| 740 | 740 | ||
| 741 | snd_soc_write(codec, WM8961_CLOCKING1, reg); | 741 | snd_soc_write(codec, WM8961_CLOCKING1, reg); |