Browse Source

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>
Charles Keepax 9 years ago
parent
commit
d347792c31
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/mfd/arizona-core.c

+ 3 - 1
drivers/mfd/arizona-core.c

@@ -1462,7 +1462,7 @@ int arizona_dev_init(struct arizona *arizona)
 	/* Set up for interrupts */
 	/* Set up for interrupts */
 	ret = arizona_irq_init(arizona);
 	ret = arizona_irq_init(arizona);
 	if (ret != 0)
 	if (ret != 0)
-		goto err_reset;
+		goto err_pm;
 
 
 	pm_runtime_set_autosuspend_delay(arizona->dev, 100);
 	pm_runtime_set_autosuspend_delay(arizona->dev, 100);
 	pm_runtime_use_autosuspend(arizona->dev);
 	pm_runtime_use_autosuspend(arizona->dev);
@@ -1486,6 +1486,8 @@ int arizona_dev_init(struct arizona *arizona)
 
 
 err_irq:
 err_irq:
 	arizona_irq_exit(arizona);
 	arizona_irq_exit(arizona);
+err_pm:
+	pm_runtime_disable(arizona->dev);
 err_reset:
 err_reset:
 	arizona_enable_reset(arizona);
 	arizona_enable_reset(arizona);
 	regulator_disable(arizona->dcvdd);
 	regulator_disable(arizona->dcvdd);