From a40f7696d2b79793f27b0ad6a55238d96c50e10c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Tue, 15 May 2012 19:45:40 +0200 Subject: [PATCH] --- yaml --- r: 308763 b: refs/heads/master c: 65ee362cb2c13bd164ade0eda66919a2e16d8a89 h: refs/heads/master i: 308761: 35db431cc17c81d62e64430d78c0c36089c88859 308759: 1989160a9c87837e89afae552722badd9828f891 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm8350-i2c.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7bea33ebf105..cee025792572 100644 --- 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 index 271589f8e8e3..a68aceb4e48c 100644 --- 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)