lkml.org 
[lkml]   [2012]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] mfd: da9052: Add missing regmap_exit to free a previously allocated register map
From
Date
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/da9052-i2c.c | 7 +++++--
drivers/mfd/da9052-spi.c | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 44b97c7..fdc2c6a 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -74,14 +74,16 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,

ret = da9052_i2c_enable_multiwrite(da9052);
if (ret < 0)
- goto err;
+ goto err_regmap;

ret = da9052_device_init(da9052, id->driver_data);
if (ret != 0)
- goto err;
+ goto err_regmap;

return 0;

+err_regmap:
+ regmap_exit(da9052->regmap);
err:
kfree(da9052);
return ret;
@@ -92,6 +94,7 @@ static int da9052_i2c_remove(struct i2c_client *client)
struct da9052 *da9052 = i2c_get_clientdata(client);

da9052_device_exit(da9052);
+ regmap_exit(da9052->regmap);
kfree(da9052);

return 0;
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index cdbc7ca..76bb9ea08 100644
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -52,10 +52,12 @@ static int da9052_spi_probe(struct spi_device *spi)

ret = da9052_device_init(da9052, id->driver_data);
if (ret != 0)
- goto err;
+ goto err_regmap;

return 0;

+err_regmap:
+ regmap_exit(da9052->regmap);
err:
kfree(da9052);
return ret;
@@ -66,6 +68,7 @@ static int da9052_spi_remove(struct spi_device *spi)
struct da9052 *da9052 = dev_get_drvdata(&spi->dev);

da9052_device_exit(da9052);
+ regmap_exit(da9052->regmap);
kfree(da9052);

return 0;
--
1.7.5.4




\
 
 \ /
  Last update: 2012-01-10 08:13    [from the cache]
©2003-2011 Jasper Spaans