Merge remote-tracking branch 'regulator/topic/core' into regulator-next (6b468562) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/regulator/core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ static struct device_node of_get_regulator(struct device dev, const char *supp
		regnode = of_parse_phandle(dev->of_node, prop_name, 0);

		if (!regnode) {
		dev_dbg(dev, "Looking up %s property in node %s failed",
		dev_dbg(dev, "Looking up %s property in node %s failed\n",
		prop_name, dev->of_node->full_name);
		return NULL;
		}
		@@ -293,7 +293,8 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
		}

		/* operating mode constraint check */
		static int regulator_mode_constrain(struct regulator_dev rdev, int mode)
		static int regulator_mode_constrain(struct regulator_dev *rdev,
		unsigned int *mode)
		{
		switch (*mode) {
		case REGULATOR_MODE_FAST: