summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-09-26 15:33:50 +0200
committerLee Jones <lee.jones@linaro.org>2013-10-23 17:21:36 +0200
commit7178347e1c675aefefce09357c988db0a9bf6e96 (patch)
treed645734b47ea155892ea627253552b8daef20610
parentmfd: palmas: Add MODULE_DEVICE_TABLE for of_device table (diff)
downloadlinux-7178347e1c675aefefce09357c988db0a9bf6e96.tar.xz
linux-7178347e1c675aefefce09357c988db0a9bf6e96.zip
mfd: palmas: Reset pm_power_off if it is set for the device
If Palams supports the system power controller and pm_power_off is implemented through the Palmas driver then reset the pm_power_off in driver remove. This will avoid the call of Palmas driver after removal of driver. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/palmas.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 3b63139fe563..6aab016f4c37 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -570,6 +570,11 @@ static int palmas_i2c_remove(struct i2c_client *i2c)
regmap_del_irq_chip(palmas->irq, palmas->irq_data);
+ if (palmas == palmas_dev) {
+ pm_power_off = NULL;
+ palmas_dev = NULL;
+ }
+
return 0;
}