diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2009-01-19 13:20:58 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-03-31 04:56:20 -0400 |
commit | b136fb4463d13eea129bf090a8a465bba6bf0003 (patch) | |
tree | 48de26101e37833a79f6b3d62f4526dcca8f91fe /drivers/regulator/wm8350-regulator.c | |
parent | 9485397aa2195e82da6373586a66689526675ad4 (diff) |
Regulator: Push lock out of _notifier_call_chain + add voltage change event.
Regulator: Push lock out of _notifier_call_chain and into caller functions
(side effect of fixing deadlock in regulator_force_disable)
+ Add a voltage changed event.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/wm8350-regulator.c')
-rw-r--r-- | drivers/regulator/wm8350-regulator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 5056e23e4414..afad611fbb80 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c | |||
@@ -1293,6 +1293,7 @@ static void pmic_uv_handler(struct wm8350 *wm8350, int irq, void *data) | |||
1293 | { | 1293 | { |
1294 | struct regulator_dev *rdev = (struct regulator_dev *)data; | 1294 | struct regulator_dev *rdev = (struct regulator_dev *)data; |
1295 | 1295 | ||
1296 | mutex_lock(&rdev->mutex); | ||
1296 | if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2) | 1297 | if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2) |
1297 | regulator_notifier_call_chain(rdev, | 1298 | regulator_notifier_call_chain(rdev, |
1298 | REGULATOR_EVENT_REGULATION_OUT, | 1299 | REGULATOR_EVENT_REGULATION_OUT, |
@@ -1301,6 +1302,7 @@ static void pmic_uv_handler(struct wm8350 *wm8350, int irq, void *data) | |||
1301 | regulator_notifier_call_chain(rdev, | 1302 | regulator_notifier_call_chain(rdev, |
1302 | REGULATOR_EVENT_UNDER_VOLTAGE, | 1303 | REGULATOR_EVENT_UNDER_VOLTAGE, |
1303 | wm8350); | 1304 | wm8350); |
1305 | mutex_unlock(&rdev->mutex); | ||
1304 | } | 1306 | } |
1305 | 1307 | ||
1306 | static int wm8350_regulator_probe(struct platform_device *pdev) | 1308 | static int wm8350_regulator_probe(struct platform_device *pdev) |