Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316217
b: refs/heads/master
c: 4082010
h: refs/heads/master
i:
  316215: 7697c3c
v: v3
  • Loading branch information
Dan Carpenter authored and Mark Brown committed Jun 7, 2012
1 parent 73f1af4 commit a33fda8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a265367ccbe72010757a56e5776fcf9a49370181
refs/heads/master: 40820105d4caef1489edd56e9dc2b85871b65308
3 changes: 1 addition & 2 deletions trunk/sound/soc/codecs/isabelle.c
Original file line number Diff line number Diff line change
Expand Up @@ -1126,15 +1126,14 @@ 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);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
ret);
return ret;
}
i2c_set_clientdata(i2c, isabelle_regmap);

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_isabelle, isabelle_dai,
Expand Down

0 comments on commit a33fda8

Please sign in to comment.