Fix double free in probe error path introduced by the recent conversion
of wm8350 to use regmap.
Signed-off-by: Johan Hovold <[email protected]>
---
drivers/mfd/wm8350-i2c.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
index 271589f..a68aceb 100644
--- a/drivers/mfd/wm8350-i2c.c
+++ b/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)
--
1.7.8.5
On Tue, May 15, 2012 at 07:45:40PM +0200, Johan Hovold wrote:
> Fix double free in probe error path introduced by the recent conversion
> of wm8350 to use regmap.
Acked-by: Mark Brown <[email protected]>
Hi Johan,
On Tue, May 15, 2012 at 07:45:40PM +0200, Johan Hovold wrote:
> Fix double free in probe error path introduced by the recent conversion
> of wm8350 to use regmap.
Applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/