diff options
| author | Florian Vaussard <florian.vaussard@epfl.ch> | 2013-06-18 15:18:00 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-19 10:19:40 +0200 |
| commit | cb3cabd6788dd8c2e87dc7262a45a24e063681a3 (patch) | |
| tree | ff5c4fe3b65c64540f00e2ed20e41db2b151bedd /drivers/mfd | |
| parent | e77a4c2fdd549efbd4897522d83005f9a5f81c87 (diff) | |
| download | linux-stable-cb3cabd6788dd8c2e87dc7262a45a24e063681a3.tar.gz linux-stable-cb3cabd6788dd8c2e87dc7262a45a24e063681a3.tar.bz2 linux-stable-cb3cabd6788dd8c2e87dc7262a45a24e063681a3.zip | |
mfd: twl4030-power: Fix relocking on error
If an error occurs when loading power scripts or resources, the
registers are not correctly relocked. Fix it.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-power.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index d027581e7eb2..a5fd3c738211 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -558,6 +558,7 @@ int twl4030_power_probe(struct platform_device *pdev) struct twl4030_power_data *pdata = pdev->dev.platform_data; struct device_node *node = pdev->dev.of_node; int err = 0; + int err2 = 0; u8 val; if (!pdata && !node) { @@ -581,12 +582,12 @@ int twl4030_power_probe(struct platform_device *pdev) err = twl4030_power_configure_scripts(pdata); if (err) { pr_err("TWL4030 failed to load scripts\n"); - return err; + goto relock; } err = twl4030_power_configure_resources(pdata); if (err) { pr_err("TWL4030 failed to configure resource\n"); - return err; + goto relock; } } @@ -612,10 +613,13 @@ int twl4030_power_probe(struct platform_device *pdev) } relock: - err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, 0, + err2 = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, 0, TWL4030_PM_MASTER_PROTECT_KEY); - if (err) + if (err2) { pr_err("TWL4030 Unable to relock registers\n"); + return err2; + } + return err; } |