diff options
-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, | |||
74 | 74 | ||
75 | ret = da9052_i2c_enable_multiwrite(da9052); | 75 | ret = da9052_i2c_enable_multiwrite(da9052); |
76 | if (ret < 0) | 76 | if (ret < 0) |
77 | goto err; | 77 | goto err_regmap; |
78 | 78 | ||
79 | ret = da9052_device_init(da9052, id->driver_data); | 79 | ret = da9052_device_init(da9052, id->driver_data); |
80 | if (ret != 0) | 80 | if (ret != 0) |
81 | goto err; | 81 | goto err_regmap; |
82 | 82 | ||
83 | return 0; | 83 | return 0; |
84 | 84 | ||
85 | err_regmap: | ||
86 | regmap_exit(da9052->regmap); | ||
85 | err: | 87 | err: |
86 | kfree(da9052); | 88 | kfree(da9052); |
87 | return ret; | 89 | return ret; |
@@ -92,6 +94,7 @@ static int da9052_i2c_remove(struct i2c_client *client) | |||
92 | struct da9052 *da9052 = i2c_get_clientdata(client); | 94 | struct da9052 *da9052 = i2c_get_clientdata(client); |
93 | 95 | ||
94 | da9052_device_exit(da9052); | 96 | da9052_device_exit(da9052); |
97 | regmap_exit(da9052->regmap); | ||
95 | kfree(da9052); | 98 | kfree(da9052); |
96 | 99 | ||
97 | return 0; | 100 | 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) | |||
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; |