Commit 09d3f6f1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/core' of... 

Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb

Conflicts:
	drivers/regulator/core.c
parents bfa21a0d 39138818

drivers/regulator/core.c

+3 −3
Original line number Diff line number Diff line
@@ -3586,7 +3586,7 @@ regulator_register(const struct regulator_desc *regulator_desc, 
	const struct regulation_constraints *constraints = NULL;

	const struct regulator_init_data *init_data;

	struct regulator_config *config = NULL;

	static atomic_t regulator_no = ATOMIC_INIT(0);

	static atomic_t regulator_no = ATOMIC_INIT(-1);

	struct regulator_dev *rdev;

	struct device *dev;

	int ret, i;
@@ -3669,8 +3669,8 @@ regulator_register(const struct regulator_desc *regulator_desc, 
	/* register with sysfs */

	rdev->dev.class = &regulator_class;

	rdev->dev.parent = dev;

	dev_set_name(&rdev->dev, "regulator.%d",

		     atomic_inc_return(&regulator_no) - 1);

	dev_set_name(&rdev->dev, "regulator.%lu",

		    (unsigned long) atomic_inc_return(&regulator_no));

	ret = device_register(&rdev->dev);

	if (ret != 0) {

		put_device(&rdev->dev);