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

Commit 15db0c8d authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 70c97e3b 60a2362f

drivers/regulator/core.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -828,7 +828,7 @@ static void print_constraints(struct regulator_dev *rdev) 
	if (!count)

	if (!count)

		sprintf(buf, "no parameters");

		sprintf(buf, "no parameters");





	rdev_info(rdev, "%s\n", buf);

	rdev_dbg(rdev, "%s\n", buf);





	if ((constraints->min_uV != constraints->max_uV) &&

	if ((constraints->min_uV != constraints->max_uV) &&

	    !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE))

	    !(constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE))
@@ -1713,6 +1713,8 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) 
				gpiod_put(pin->gpiod);

				gpiod_put(pin->gpiod);

				list_del(&pin->list);

				list_del(&pin->list);

				kfree(pin);

				kfree(pin);

				rdev->ena_pin = NULL;

				return;

			} else {

			} else {

				pin->request_count--;

				pin->request_count--;

			}

			}