diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-04-20 18:16:37 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-05-09 10:23:52 +0300 |
| commit | d6441dc5ce2bc8b296a65952d840d2f16e37f974 (patch) | |
| tree | b8dcb81743c279a746d61b7db9099f597d83d79b /drivers/mfd | |
| parent | 32852bcab29d8d43c5d4ddeed9937817e8e8c990 (diff) | |
| download | linux-d6441dc5ce2bc8b296a65952d840d2f16e37f974.tar.xz | |
mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path
The clk32k clock is prepared and enabled in twl6040_power() but the clock
is left enabled in case of an error while it should be disable/unprepared.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6040.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index 85cc32a2e0e0..852d5874aabb 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -304,6 +304,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) /* use automatic power-up sequence */ ret = twl6040_power_up_automatic(twl6040); if (ret) { + clk_disable_unprepare(twl6040->clk32k); twl6040->power_count = 0; goto out; } @@ -311,6 +312,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) /* use manual power-up sequence */ ret = twl6040_power_up_manual(twl6040); if (ret) { + clk_disable_unprepare(twl6040->clk32k); twl6040->power_count = 0; goto out; } |