mfd: arizona: Add missing disable of PM runtime on probe error path
Subsystems (2)
PATCH 1/1 mfd: arizona: Add missing disable of PM runtime on probe error path
Signed-off-by Charles Keepax <[email protected]>
--- drivers/mfd/arizona-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mfd/arizona-core.c +3 -1
@@ -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);
Signature · 1 line
2.1.4
Lee Jones
AppliedQuoted 4 lines · Charles Keepax
Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/arizona-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.
Quoted 22 lines
drivers/mfd/arizona-core.c +3
-1@@ -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);
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog