diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-01-10 15:09:56 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 18:46:30 +0100 |
| commit | 4d75dd61dfb53eaa286c54fb121e5b51b106c272 (patch) | |
| tree | db0ac935269049c352493c9f5cedb332939cd02e /drivers/mfd | |
| parent | d48f411c10f2badaf88e6050cd3d3acd52197356 (diff) | |
| download | talos-obmc-linux-4d75dd61dfb53eaa286c54fb121e5b51b106c272.tar.gz talos-obmc-linux-4d75dd61dfb53eaa286c54fb121e5b51b106c272.zip | |
mfd: Add missing regmap_exit to free a previously allocated da9052 register map
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/da9052-i2c.c | 7 | ||||
| -rw-r--r-- | 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 44b97c70a61f..fdc2c6a74e62 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 cdbc7cad326f..76bb9ea0816e 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; |
