diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-03-06 08:06:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-06 13:22:11 +0100 |
| commit | f320515a589eeb9bfbc317801e60b87a12f9eae1 (patch) | |
| tree | da55782d50f800009bac76ab5e6e8722dae0074d /sound/soc/codecs/wm8804.c | |
| parent | ASoC: wm8962: Remove defaults for volatile registers (diff) | |
| download | linux-f320515a589eeb9bfbc317801e60b87a12f9eae1.tar.xz linux-f320515a589eeb9bfbc317801e60b87a12f9eae1.zip | |
ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe
commit 891271c "ASoC: Convert wm8804 to direct regmap API usage"
only converts wm8804_spi_probe to use regmap_init_spi.
This patch adds missing regmap_init_i2c in wm8804_i2c_probe.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8804.c')
| -rw-r--r-- | sound/soc/codecs/wm8804.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 7ee8dcf1fe32..6bd1b767b138 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -755,6 +755,12 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, if (!wm8804) return -ENOMEM; + wm8804->regmap = regmap_init_i2c(i2c, &wm8804_regmap_config); + if (IS_ERR(wm8804->regmap)) { + ret = PTR_ERR(wm8804->regmap); + return ret; + } + i2c_set_clientdata(i2c, wm8804); ret = snd_soc_register_codec(&i2c->dev, |