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>

diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 85cc32a2e0e052984e0eeb7c59fca558f3d91e0e..852d5874aabb764ae7948d9cbfd4abf5123d413c 100644 (file)
--- 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;
                        }