Skip to content

Commit

Permalink
mfd: arizona: Disable DCVDD before we destroy the MFD
Browse files Browse the repository at this point in the history
As DCVDD is probably supplied by a child of the MFD device move its
disable to before we destroy the MFD children as the regulator likely
won't exist after that.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Charles Keepax authored and Lee Jones committed Jul 9, 2014
1 parent b804020 commit df6b335
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/mfd/arizona-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1025,14 +1025,16 @@ 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);
arizona_free_irq(arizona, ARIZONA_IRQ_CLKGEN_ERR, 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;
Expand Down

0 comments on commit df6b335

Please sign in to comment.