Merge remote-tracking branch 'regulator/topic/core' into regulator-linus (7cd94843) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/regulator/core.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -1334,9 +1334,8 @@ static struct regulator _regulator_get(struct device dev, const char *id,
		* If we have return value from dev_lookup fail, we do not expect to
		* succeed, so, quit with appropriate error value
		*/
		if (ret && ret != -ENODEV) {
		if (ret && ret != -ENODEV)
		goto out;
		}

		if (!devname)
		devname = "deviceless";
		@@ -1351,7 +1350,8 @@ static struct regulator _regulator_get(struct device dev, const char *id,

		rdev = dummy_regulator_rdev;
		goto found;
		} else {
		/* Don't log an error when called from regulator_get_optional() */
		} else if (!have_full_constraints() \|\| exclusive) {
		dev_err(dev, "dummy supplies not allowed\n");
		}

		@@ -2244,7 +2244,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,
		if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
		ret = regulator_get_voltage(regulator);
		if (ret >= 0)
		return (min_uV <= ret && ret <= max_uV);
		return min_uV <= ret && ret <= max_uV;
		else
		return ret;
		}
		@@ -3835,9 +3835,8 @@ static int __init regulator_init_complete(void)
		* goes wrong. */
		rdev_info(rdev, "disabling\n");
		ret = ops->disable(rdev);
		if (ret != 0) {
		if (ret != 0)
		rdev_err(rdev, "couldn't disable: %d\n", ret);
		}
		} else {
		/* The intention is that in future we will
		* assume that full constraints are provided