diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-10 19:16:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-10 19:16:06 +0100 |
| commit | 4ec0853ac5d55e8984d7f727bc16bf16675e6484 (patch) | |
| tree | 5aca18d0d40e6832cf0184c027750644fad60a55 /drivers/regulator | |
| parent | bea3672833dac06e37651e755d24ffdb0c471907 (diff) | |
| parent | 1b42085af787eb2e465863ba82633bbd905a7897 (diff) | |
| download | linux-4ec0853ac5d55e8984d7f727bc16bf16675e6484.tar.gz linux-4ec0853ac5d55e8984d7f727bc16bf16675e6484.tar.bz2 linux-4ec0853ac5d55e8984d7f727bc16bf16675e6484.zip | |
Merge remote-tracking branch 'regulator/topic/wm8350' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -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] = { static irqreturn_t pmic_uv_handler(int irq, void *data) { struct regulator_dev *rdev = (struct regulator_dev *)data; - struct wm8350 *wm8350 = rdev_get_drvdata(rdev); mutex_lock(&rdev->mutex); if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2) regulator_notifier_call_chain(rdev, REGULATOR_EVENT_REGULATION_OUT, - wm8350); + NULL); else regulator_notifier_call_chain(rdev, REGULATOR_EVENT_UNDER_VOLTAGE, - wm8350); + NULL); mutex_unlock(&rdev->mutex); return IRQ_HANDLED; |