2012-05-15 17:46:15

by Johan Hovold

[permalink] [raw]
Subject: [PATCH] mfd: Fix double free in wm8350 error path

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


2012-05-15 21:23:56

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] mfd: Fix double free in wm8350 error path

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]>

Attachments:
(No filename) (223.00 B)
 signature.asc (836.00 B)
Digital signature Download all attachments

2012-05-18 10:27:36

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [PATCH] mfd: Fix double free in wm8350 error path

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/