From b5df7a92de34263d7d16f86239b4cc61a0de1d6b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 11 Jul 2012 09:41:23 +0300 Subject: [PATCH] --- yaml --- r: 316312 b: refs/heads/master c: f96985e3b3cfcd2d21faca79863fb34533d575aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/sta529.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4101a1b10b8d..93c67c98643b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b4d39fc2a80e271ac8d44fccd02277a4b63c557 +refs/heads/master: f96985e3b3cfcd2d21faca79863fb34533d575aa diff --git a/trunk/sound/soc/codecs/sta529.c b/trunk/sound/soc/codecs/sta529.c index a9f34c736bfa..0c225cd569d2 100644 --- a/trunk/sound/soc/codecs/sta529.c +++ b/trunk/sound/soc/codecs/sta529.c @@ -397,8 +397,9 @@ static __devinit int sta529_i2c_probe(struct i2c_client *i2c, sta529->regmap = devm_regmap_init_i2c(i2c, &sta529_regmap); if (IS_ERR(sta529->regmap)) { + ret = PTR_ERR(sta529->regmap); dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); - return PTR_ERR(sta529->regmap); + return ret; } i2c_set_clientdata(i2c, sta529);