From: Charles Keepax Date: Mon, 2 Jun 2014 08:50:39 +0000 (+0100) Subject: mfd: arizona: Disable PM runtime at start of driver removal X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b804020adadae5ebe82850bd82e29f224d044164;p=openwrt%2Fstaging%2Fblogic.git mfd: arizona: Disable PM runtime at start of driver removal We don't want to trigger any PM runtime operations whilst we are tearing down the driver, as things the suspend and resume callbacks rely on might already have been destroyed. So disable PM runtime for the device as the first step arizona_dev_exit. Signed-off-by: Charles Keepax Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index cfc191abae4a..9d71ebccc8b0 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -1023,11 +1023,12 @@ EXPORT_SYMBOL_GPL(arizona_dev_init); int arizona_dev_exit(struct arizona *arizona) { + pm_runtime_disable(arizona->dev); + 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); - pm_runtime_disable(arizona->dev); arizona_irq_exit(arizona); if (arizona->pdata.reset) gpio_set_value_cansleep(arizona->pdata.reset, 0);