diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-11 10:43:40 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-11 10:43:40 +0900 |
| commit | 4158a057413c8a6ee1c0fc49b8679bcdb2b5b32d (patch) | |
| tree | 373028de168a101aa4598bfe5fcf354665d0423e | |
| parent | ASoC: soc-io: Add CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI guards for regmap_init_i2c/regmap_init_spi (diff) | |
| parent | ASoC: Add missing break in WM8994 probe (diff) | |
Merge branch 'for-3.1' into for-3.2
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index fb5c96163610..4487c5e6ad89 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2983,6 +2983,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) wm8994->hubs.dcs_readback_mode = 2; break; } + break; case WM8958: wm8994->hubs.dcs_readback_mode = 1; |