summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-05-15 17:45:40 (GMT)
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-20 15:27:09 (GMT)
commit65ee362cb2c13bd164ade0eda66919a2e16d8a89 (patch)
treeedbe7e94f7edbe996dfa834affd7b65b86c1dad7 /drivers/mfd
parentfa648e51f84d060ef991eeee4d7bacec45d7fbfd (diff)
downloadlinux-fsl-qoriq-65ee362cb2c13bd164ade0eda66919a2e16d8a89.tar.xz
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 <jhovold@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm8350-i2c.c10
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)