X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fmfd%2Farizona-core.c;h=9df02502326a468d868b9781c33389e019021d44;hb=df6b3352d88560459d4a4926b36409334332f2cb;hp=9d71ebccc8b02b97623d07a5870aa71059607aae;hpb=b804020adadae5ebe82850bd82e29f224d044164;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 9d71ebccc8b0..9df02502326a 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -1025,6 +1025,8 @@ int arizona_dev_exit(struct arizona *arizona)
 {
 	pm_runtime_disable(arizona->dev);
 
+	regulator_disable(arizona->dcvdd);
+
 	mfd_remove_devices(arizona->dev);
 	arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);
 	arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona);
@@ -1032,7 +1034,7 @@ int arizona_dev_exit(struct arizona *arizona)
 	arizona_irq_exit(arizona);
 	if (arizona->pdata.reset)
 		gpio_set_value_cansleep(arizona->pdata.reset, 0);
-	regulator_disable(arizona->dcvdd);
+
 	regulator_bulk_disable(ARRAY_SIZE(arizona->core_supplies),
 			       arizona->core_supplies);
 	return 0;