diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-04-20 17:16:38 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-05-09 09:23:45 +0200 |
| commit | 32852bcab29d8d43c5d4ddeed9937817e8e8c990 (patch) | |
| tree | 7ff4aab5b30af64f942b1bc4a8b909435d72aaf4 /drivers | |
| parent | mfd: tps6105x: Remove linux/regulator/driver.h include (diff) | |
| download | linux-32852bcab29d8d43c5d4ddeed9937817e8e8c990.tar.xz linux-32852bcab29d8d43c5d4ddeed9937817e8e8c990.zip | |
mfd: twl6040: Check clk_prepare_enable() return value in twl6040_power()
The clk_prepare_enable() function can fail so check the return
value and propagate the error in case of a failure.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/twl6040.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index 08a693cd38cc..85cc32a2e0e0 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -291,7 +291,11 @@ int twl6040_power(struct twl6040 *twl6040, int on) if (twl6040->power_count++) goto out; - clk_prepare_enable(twl6040->clk32k); + ret = clk_prepare_enable(twl6040->clk32k); + if (ret) { + twl6040->power_count = 0; + goto out; + } /* Allow writes to the chip */ regcache_cache_only(twl6040->regmap, false); |