diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-20 00:10:48 +0400 |
| commit | c19ae9c2483f0253bb58d3d3c28ac20386df6066 (patch) | |
| tree | 9e3339fd0c9ac3285839626b25bb8d30bea60abd /sound/soc/codecs/wm_hubs.c | |
| parent | 836f44a71d886bc81551597612e3b1797133985f (diff) | |
| parent | b2824f4e0990716407b0c0e7acee75bb6353febf (diff) | |
| download | linux-linaro-tracking-with-fixes-c19ae9c2483f0253bb58d3d3c28ac20386df6066.tar.gz | |
Automatically merging tracking-linux-3.6.y into merge-linux-linaro-core-3.6linux-linaro-core-3.6-20121220.0linux-linaro-core-3.6
Conflicting files:
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 61baa48823c..57b27efb549 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -634,6 +634,11 @@ void wm_hubs_update_class_w(struct snd_soc_codec *codec) snd_soc_update_bits(codec, WM8993_CLASS_W_0, WM8993_CP_DYN_V | WM8993_CP_DYN_FREQ, enable); + + snd_soc_write(codec, WM8993_LEFT_OUTPUT_VOLUME, + snd_soc_read(codec, WM8993_LEFT_OUTPUT_VOLUME)); + snd_soc_write(codec, WM8993_RIGHT_OUTPUT_VOLUME, + snd_soc_read(codec, WM8993_RIGHT_OUTPUT_VOLUME)); } EXPORT_SYMBOL_GPL(wm_hubs_update_class_w); |