diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-15 15:05:45 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-15 15:05:45 -0400 |
| commit | 21363cf0ca5c9c62e34e37422fb1d13d70d3de3c (patch) | |
| tree | 34aeeb1415aaa320555d735e3b22f4a4fb42130e /sound/soc/codecs/wm8994.c | |
| parent | b0791dda813c179e539b0fc1ecd3f5f30f2571e2 (diff) | |
| parent | c7f5f2389377b66028bc129890aa653deafe8d39 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Last minute fixes
Some last minute fixes for ASoC. Small, focused changes to specific
drivers.
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 6c1fe3afd4b5..2de12ebe43b5 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -1144,7 +1144,7 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w, | |||
| 1144 | snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5, | 1144 | snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5, |
| 1145 | WM8994_AIF2DACL_ENA | | 1145 | WM8994_AIF2DACL_ENA | |
| 1146 | WM8994_AIF2DACR_ENA, 0); | 1146 | WM8994_AIF2DACR_ENA, 0); |
| 1147 | snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5, | 1147 | snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4, |
| 1148 | WM8994_AIF2ADCL_ENA | | 1148 | WM8994_AIF2ADCL_ENA | |
| 1149 | WM8994_AIF2ADCR_ENA, 0); | 1149 | WM8994_AIF2ADCR_ENA, 0); |
| 1150 | 1150 | ||