Skip to contentSkip to conversation

mfd: da9052: Add missing regmap_exit to free a previously allocated register map

PATCH In review Axel Lin 2 participants 2 messages Jan 10, 2012 – Feb 20, 2012

Subsystems (2)
Multifunction devices (MFD) Dialog semiconductor drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mfd: da9052: Add missing regmap_exit to free a previously allocated register map

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mfd/da9052-i2c.c |    7 +++++--
 drivers/mfd/da9052-spi.c |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/mfd/da9052-i2c.c +5 -2
index 44b97c7..fdc2c6a 100644
@@ -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;
drivers/mfd/da9052-spi.c +4 -1
index cdbc7ca..76bb9ea08 100644
@@ -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;
Signature · 1 line
1.7.5.4