---

yaml --- r: 308763 b: refs/heads/master c: 65ee362 h: refs/heads/master i: 308761: 35db431 308759: 1989160 v: v3
git-mirror · May 20, 2012 · a40f769 · a40f769
1 parent a396574
commit a40f769
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa648e51f84d060ef991eeee4d7bacec45d7fbfd
+refs/heads/master: 65ee362cb2c13bd164ade0eda66919a2e16d8a89
diff --git a/trunk/drivers/mfd/wm8350-i2c.c b/trunk/drivers/mfd/wm8350-i2c.c
@@ -49,15 +49,7 @@ static int wm8350_i2c_probe(struct i2c_client *i2c,
 	i2c_set_clientdata(i2c, wm8350);
 	wm8350->dev = &i2c->dev;
 
-	ret = wm8350_device_init(wm8350, i2c->irq, i2c->dev.platform_data);
-	if (ret < 0)
-		goto err;
-
-	return ret;
-
-err:
-	regmap_exit(wm8350->regmap);
-	return ret;
+	return wm8350_device_init(wm8350, i2c->irq, i2c->dev.platform_data);
 }
 
 static int wm8350_i2c_remove(struct i2c_client *i2c)