From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Mon, 27 Jun 2016 14:19:11 +0000 (+0100)
Subject: mfd: arizona: Add missing disable of PM runtime on probe error path
X-Git-Tag: v4.8-rc1~78^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d347792c315171fd89dda9d6cbebea756c29b3ea;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index bf27179675974..e4f97b3c824bf 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);