Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/wm8350' into regulator-…
Browse files Browse the repository at this point in the history
…next
  • Loading branch information
Mark Brown committed Apr 10, 2015
2 parents bea3672 + 1b42085 commit 4ec0853
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/regulator/wm8350-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4ec0853

Please sign in to comment.