Unverified Commit 8adb4e64 authored by Michał Mirosław's avatar Michał Mirosław Committed by Mark Brown
Browse files

regulator/core: regulator_register: set device->class earlier 



When fixing a memory leak in commit d3c73156 ("regulator: plug
of_node leak in regulator_register()'s error path") it moved the
device_initialize() call earlier, but did not move the `dev->class`
initialization.  The bug was spotted and fixed by reverting part of
the commit (in commit 5f4b204b "regulator: core: fix kobject
release warning and memory leak in regulator_register()") but
introducing a different bug: now early error paths use `kfree(dev)`
instead of `put_device()` for an already initialized `struct device`.

Move the missing assignments to just after `device_initialize()`.

Fixes: d3c73156 ("regulator: plug of_node leak in regulator_register()'s error path")
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/b5b19cb458c40c9d02f3d5a7bd1ba7d97ba17279.1695077303.git.mirq-linux@rere.qmqm.pl


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7e37c851

drivers/regulator/core.c

+2 −2
Original line number Diff line number Diff line
@@ -5542,6 +5542,8 @@ regulator_register(struct device *dev, 
		goto rinse;

	}

	device_initialize(&rdev->dev);

	dev_set_drvdata(&rdev->dev, rdev);

	rdev->dev.class = &regulator_class;

	spin_lock_init(&rdev->err_lock);



	/*
@@ -5603,11 +5605,9 @@ regulator_register(struct device *dev, 
		rdev->supply_name = regulator_desc->supply_name;



	/* register with sysfs */

	rdev->dev.class = &regulator_class;

	rdev->dev.parent = config->dev;

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

		    (unsigned long) atomic_inc_return(&regulator_no));

	dev_set_drvdata(&rdev->dev, rdev);



	/* set regulator constraints */

	if (init_data)