diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-06-27 16:19:11 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-06-29 11:16:07 +0200 |
| commit | d347792c315171fd89dda9d6cbebea756c29b3ea (patch) | |
| tree | 791fca3a8b384e326a80f9896a01c9de7281ac9e /drivers/mfd | |
| parent | mfd: stmpe: Move platform data into MFD driver (diff) | |
| download | linux-d347792c315171fd89dda9d6cbebea756c29b3ea.tar.xz linux-d347792c315171fd89dda9d6cbebea756c29b3ea.zip | |
mfd: arizona: Add missing disable of PM runtime on probe error path
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index bf2717967597..e4f97b3c824b 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -1462,7 +1462,7 @@ int arizona_dev_init(struct arizona *arizona) /* Set up for interrupts */ ret = arizona_irq_init(arizona); if (ret != 0) - goto err_reset; + goto err_pm; pm_runtime_set_autosuspend_delay(arizona->dev, 100); pm_runtime_use_autosuspend(arizona->dev); @@ -1486,6 +1486,8 @@ int arizona_dev_init(struct arizona *arizona) err_irq: arizona_irq_exit(arizona); +err_pm: + pm_runtime_disable(arizona->dev); err_reset: arizona_enable_reset(arizona); regulator_disable(arizona->dcvdd); |