diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-10 14:16:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-10 14:16:06 -0400 |
commit | 4ec0853ac5d55e8984d7f727bc16bf16675e6484 (patch) | |
tree | 5aca18d0d40e6832cf0184c027750644fad60a55 | |
parent | bea3672833dac06e37651e755d24ffdb0c471907 (diff) | |
parent | 1b42085af787eb2e465863ba82633bbd905a7897 (diff) |
Merge remote-tracking branch 'regulator/topic/wm8350' into regulator-next
-rw-r--r-- | drivers/regulator/wm8350-regulator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 7ec7c390eeda..95f6b040186e 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c | |||
@@ -1151,17 +1151,16 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { | |||
1151 | static irqreturn_t pmic_uv_handler(int irq, void *data) | 1151 | static irqreturn_t pmic_uv_handler(int irq, void *data) |
1152 | { | 1152 | { |
1153 | struct regulator_dev *rdev = (struct regulator_dev *)data; | 1153 | struct regulator_dev *rdev = (struct regulator_dev *)data; |
1154 | struct wm8350 *wm8350 = rdev_get_drvdata(rdev); | ||
1155 | 1154 | ||
1156 | mutex_lock(&rdev->mutex); | 1155 | mutex_lock(&rdev->mutex); |
1157 | if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2) | 1156 | if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2) |
1158 | regulator_notifier_call_chain(rdev, | 1157 | regulator_notifier_call_chain(rdev, |
1159 | REGULATOR_EVENT_REGULATION_OUT, | 1158 | REGULATOR_EVENT_REGULATION_OUT, |
1160 | wm8350); | 1159 | NULL); |
1161 | else | 1160 | else |
1162 | regulator_notifier_call_chain(rdev, | 1161 | regulator_notifier_call_chain(rdev, |
1163 | REGULATOR_EVENT_UNDER_VOLTAGE, | 1162 | REGULATOR_EVENT_UNDER_VOLTAGE, |
1164 | wm8350); | 1163 | NULL); |
1165 | mutex_unlock(&rdev->mutex); | 1164 | mutex_unlock(&rdev->mutex); |
1166 | 1165 | ||
1167 | return IRQ_HANDLED; | 1166 | return IRQ_HANDLED; |