diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 21:33:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 21:33:12 +0100 |
| commit | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch) | |
| tree | a7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/codecs | |
| parent | ASoC: Fix a memory leak in alc5623_i2c_probe error path (diff) | |
| parent | ASoC: Restore WM8994 volatile and readable register operations (diff) | |
| download | linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/stac9766.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8523.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 7f2773038242..78b2b50271e2 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { .reg_cache_size = sizeof(stac9766_reg), .reg_word_size = sizeof(u16), .reg_cache_step = 2, + .reg_cache_default = stac9766_reg, }; static __devinit int stac9766_probe(struct platform_device *pdev) diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 1bda09baa851..08f3189f4b3f 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c @@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream, return -EINVAL; } - return 0; snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &wm8523->rate_constraint); diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 435508fd6137..63a3895b021a 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2515,6 +2515,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = { .resume = wm8994_resume, .read = wm8994_read, .write = wm8994_write, + .readable_register = wm8994_readable, + .volatile_register = wm8994_volatile, .set_bias_level = wm8994_set_bias_level, }; |