diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-02 19:57:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-02 19:57:19 +0100 |
| commit | ea945ab4d27e101105d7b482183d7147d1f354ce (patch) | |
| tree | 7fb50dd08c6bd49d31dba2bc91cc85daafebd324 /sound/soc/codecs/wm8753.c | |
| parent | a3c6dac201005077f78ea5b18c89e6cd568e2d85 (diff) | |
| parent | 21d17dd2a377ba894f26989915eb3c6e427a3656 (diff) | |
| download | linux-ea945ab4d27e101105d7b482183d7147d1f354ce.tar.bz2 | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/wm8753.c')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index fe04a101d657..a9504710bb69 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1455,8 +1455,8 @@ static int wm8753_probe(struct snd_soc_codec *codec) /* set the update bits */ snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100); + snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100); + snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100); |