diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-01-10 02:09:56 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 12:46:30 -0500 |
commit | 4d75dd61dfb53eaa286c54fb121e5b51b106c272 (patch) | |
tree | db0ac935269049c352493c9f5cedb332939cd02e /drivers/mfd/da9052-spi.c | |
parent | d48f411c10f2badaf88e6050cd3d3acd52197356 (diff) |
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/da9052-spi.c')
-rw-r--r-- | drivers/mfd/da9052-spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) | |||
52 | 52 | ||
53 | ret = da9052_device_init(da9052, id->driver_data); | 53 | ret = da9052_device_init(da9052, id->driver_data); |
54 | if (ret != 0) | 54 | if (ret != 0) |
55 | goto err; | 55 | goto err_regmap; |
56 | 56 | ||
57 | return 0; | 57 | return 0; |
58 | 58 | ||
59 | err_regmap: | ||
60 | regmap_exit(da9052->regmap); | ||
59 | err: | 61 | err: |
60 | kfree(da9052); | 62 | kfree(da9052); |
61 | return ret; | 63 | return ret; |
@@ -66,6 +68,7 @@ static int da9052_spi_remove(struct spi_device *spi) | |||
66 | struct da9052 *da9052 = dev_get_drvdata(&spi->dev); | 68 | struct da9052 *da9052 = dev_get_drvdata(&spi->dev); |
67 | 69 | ||
68 | da9052_device_exit(da9052); | 70 | da9052_device_exit(da9052); |
71 | regmap_exit(da9052->regmap); | ||
69 | kfree(da9052); | 72 | kfree(da9052); |
70 | 73 | ||
71 | return 0; | 74 | return 0; |