Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec0853a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/wm8350' into regulator-next

parents bea36728 1b42085a

drivers/regulator/wm8350-regulator.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1151,17 +1151,16 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { 
static irqreturn_t pmic_uv_handler(int irq, void *data)

static irqreturn_t pmic_uv_handler(int irq, void *data)

{

{

	struct regulator_dev *rdev = (struct regulator_dev *)data;

	struct regulator_dev *rdev = (struct regulator_dev *)data;

	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);





	mutex_lock(&rdev->mutex);

	mutex_lock(&rdev->mutex);

	if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2)

	if (irq == WM8350_IRQ_CS1 || irq == WM8350_IRQ_CS2)

		regulator_notifier_call_chain(rdev,

		regulator_notifier_call_chain(rdev,

					      REGULATOR_EVENT_REGULATION_OUT,

					      REGULATOR_EVENT_REGULATION_OUT,

					      wm8350);

					      NULL);

	else

	else

		regulator_notifier_call_chain(rdev,

		regulator_notifier_call_chain(rdev,

					      REGULATOR_EVENT_UNDER_VOLTAGE,

					      REGULATOR_EVENT_UNDER_VOLTAGE,

					      wm8350);

					      NULL);

	mutex_unlock(&rdev->mutex);

	mutex_unlock(&rdev->mutex);





	return IRQ_HANDLED;

	return IRQ_HANDLED;