Merge tag 'regulator-fix-v5.5-rc2' of... (58d90a04) · Commits · 戴 / test

drivers/regulator/core.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -1198,6 +1198,10 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
		return -EINVAL;
		}

		/* no need to loop voltages if range is continuous */
		if (rdev->desc->continuous_voltage_range)
		return 0;

		/* initial: [cmin..cmax] valid, [min_uV..max_uV] not */
		for (i = 0; i < count; i++) {
		int value;
		@@ -1938,8 +1942,8 @@ struct regulator _regulator_get(struct device dev, const char *id,
		regulator = create_regulator(rdev, dev, id);
		if (regulator == NULL) {
		regulator = ERR_PTR(-ENOMEM);
		put_device(&rdev->dev);
		module_put(rdev->owner);
		put_device(&rdev->dev);
		return regulator;
		}

		@@ -2063,13 +2067,13 @@ static void _regulator_put(struct regulator *regulator)

		rdev->open_count--;
		rdev->exclusive = 0;
		put_device(&rdev->dev);
		regulator_unlock(rdev);

		kfree_const(regulator->supply_name);
		kfree(regulator);

		module_put(rdev->owner);
		put_device(&rdev->dev);
		}

		/**
		@@ -5002,6 +5006,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
		struct regulator_dev *rdev;
		bool dangling_cfg_gpiod = false;
		bool dangling_of_gpiod = false;
		bool reg_device_fail = false;
		struct device *dev;
		int ret, i;

		@@ -5187,7 +5192,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
		dev_set_drvdata(&rdev->dev, rdev);
		ret = device_register(&rdev->dev);
		if (ret != 0) {
		put_device(&rdev->dev);
		reg_device_fail = true;
		goto unset_supplies;
		}

		@@ -5218,6 +5223,9 @@ wash:
		clean:
		if (dangling_of_gpiod)
		gpiod_put(config->ena_gpiod);
		if (reg_device_fail)
		put_device(&rdev->dev);
		else
		kfree(rdev);
		kfree(config);
		rinse:

drivers/regulator/max77650-regulator.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -386,9 +386,16 @@ static int max77650_regulator_probe(struct platform_device *pdev)
		return 0;
		}

		static const struct of_device_id max77650_regulator_of_match[] = {
		{ .compatible = "maxim,max77650-regulator" },
		{ }
		};
		MODULE_DEVICE_TABLE(of, max77650_regulator_of_match);

		static struct platform_driver max77650_regulator_driver = {
		.driver = {
		.name = "max77650-regulator",
		.of_match_table = max77650_regulator_of_match,
		},
		.probe = max77650_regulator_probe,
		};

drivers/regulator/rn5t618-regulator.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ static struct platform_driver rn5t618_regulator_driver = {

		module_platform_driver(rn5t618_regulator_driver);

		MODULE_ALIAS("platform:rn5t618-regulator");
		MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>");
		MODULE_DESCRIPTION("RN5T618 regulator driver");
		MODULE_LICENSE("GPL v2");

drivers/regulator/s5m8767.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -588,7 +588,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
		if (of_property_read_u32(reg_np, "op_mode",
		&rmode->mode)) {
		dev_warn(iodev->dev,
		"no op_mode property property at %pOF\n",
		"no op_mode property at %pOF\n",
		reg_np);

		rmode->mode = S5M8767_OPMODE_NORMAL_MODE;

Admin message