From ab45eebeec11cb2b75b18923e0149de5bb7adfa2 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 6 Mar 2012 15:06:53 +0800 Subject: [PATCH] --- yaml --- r: 293462 b: refs/heads/master c: f320515a589eeb9bfbc317801e60b87a12f9eae1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8804.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bd3d205f5dc2..fe8e18a1cf38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba106ce3d04db9085d32b47aee545c35b586827a +refs/heads/master: f320515a589eeb9bfbc317801e60b87a12f9eae1 diff --git a/trunk/sound/soc/codecs/wm8804.c b/trunk/sound/soc/codecs/wm8804.c index 7ee8dcf1fe32..6bd1b767b138 100644 --- a/trunk/sound/soc/codecs/wm8804.c +++ b/trunk/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,