From a33fda8b0661e690df952c3e09c5e7f8ce26457e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 7 Jun 2012 15:38:37 +0300 Subject: [PATCH] --- yaml --- r: 316217 b: refs/heads/master c: 40820105d4caef1489edd56e9dc2b85871b65308 h: refs/heads/master i: 316215: 7697c3ce4d6a157937f235816f7a4b8d0ebb6796 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/isabelle.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 57e3b89cf8bd..640f699989ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a265367ccbe72010757a56e5776fcf9a49370181 +refs/heads/master: 40820105d4caef1489edd56e9dc2b85871b65308 diff --git a/trunk/sound/soc/codecs/isabelle.c b/trunk/sound/soc/codecs/isabelle.c index bcc77ef0eda2..0d62f3b0f474 100644 --- a/trunk/sound/soc/codecs/isabelle.c +++ b/trunk/sound/soc/codecs/isabelle.c @@ -1126,8 +1126,6 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, struct regmap *isabelle_regmap; int ret = 0; - i2c_set_clientdata(i2c, isabelle_regmap); - isabelle_regmap = devm_regmap_init_i2c(i2c, &isabelle_regmap_config); if (IS_ERR(isabelle_regmap)) { ret = PTR_ERR(isabelle_regmap); @@ -1135,6 +1133,7 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, ret); return ret; } + i2c_set_clientdata(i2c, isabelle_regmap); ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_isabelle, isabelle_dai,