public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mfd: Fix double free in wm8350 error path
@ 2012-05-15 17:45 Johan Hovold
  2012-05-15 21:23 ` Mark Brown
  2012-05-18 10:37 ` Samuel Ortiz
  0 siblings, 2 replies; 3+ messages in thread
From: Johan Hovold @ 2012-05-15 17:45 UTC (permalink / raw)
  To: Mark Brown, Samuel Ortiz; +Cc: patches, linux-kernel, Johan Hovold

Fix double free in probe error path introduced by the recent conversion
of wm8350 to use regmap.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: Fix double free in wm8350 error path
  2012-05-15 17:45 [PATCH] mfd: Fix double free in wm8350 error path Johan Hovold
@ 2012-05-15 21:23 ` Mark Brown
  2012-05-18 10:37 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2012-05-15 21:23 UTC (permalink / raw)
  To: Johan Hovold; +Cc: Samuel Ortiz, patches, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

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 <broonie@opensource.wolfsonmicro.com>

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: Fix double free in wm8350 error path
  2012-05-15 17:45 [PATCH] mfd: Fix double free in wm8350 error path Johan Hovold
  2012-05-15 21:23 ` Mark Brown
@ 2012-05-18 10:37 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2012-05-18 10:37 UTC (permalink / raw)
  To: Johan Hovold; +Cc: Mark Brown, patches, linux-kernel

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/

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-05-18 10:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-15 17:45 [PATCH] mfd: Fix double free in wm8350 error path Johan Hovold
2012-05-15 21:23 ` Mark Brown
2012-05-18 10:37 ` Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox