* [PATCH] mfd: arizona: Add missing disable of PM runtime on probe error path
@ 2016-06-27 14:19 Charles Keepax
2016-06-27 15:04 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Charles Keepax @ 2016-06-27 14:19 UTC (permalink / raw)
To: lee.jones; +Cc: linux-kernel, patches
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index bf27179..e4f97b3 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);
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: arizona: Add missing disable of PM runtime on probe error path
2016-06-27 14:19 [PATCH] mfd: arizona: Add missing disable of PM runtime on probe error path Charles Keepax
@ 2016-06-27 15:04 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2016-06-27 15:04 UTC (permalink / raw)
To: Charles Keepax; +Cc: linux-kernel, patches
On Mon, 27 Jun 2016, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index bf27179..e4f97b3 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);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-27 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-27 14:19 [PATCH] mfd: arizona: Add missing disable of PM runtime on probe error path Charles Keepax
2016-06-27 15:04 ` Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.