Skip to content

Commit 6e80096

Browse files
osctobebroonie
authored andcommitted
regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()"
This reverts commit 5f4b204. Since rdev->dev now has a release() callback, the proper way of freeing the initialized device can be restored. Signed-off-by: Michał Mirosław <[email protected]> Link: https://lore.kernel.org/r/d7f469f3f7b1f0e1d52f9a7ede3f3c5703382090.1695077303.git.mirq-linux@rere.qmqm.pl Signed-off-by: Mark Brown <[email protected]>
1 parent 8adb4e6 commit 6e80096

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/regulator/core.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5724,15 +5724,11 @@ regulator_register(struct device *dev,
57245724
mutex_lock(&regulator_list_mutex);
57255725
regulator_ena_gpio_free(rdev);
57265726
mutex_unlock(&regulator_list_mutex);
5727-
put_device(&rdev->dev);
5728-
rdev = NULL;
57295727
clean:
57305728
if (dangling_of_gpiod)
57315729
gpiod_put(config->ena_gpiod);
5732-
if (rdev && rdev->dev.of_node)
5733-
of_node_put(rdev->dev.of_node);
5734-
kfree(rdev);
57355730
kfree(config);
5731+
put_device(&rdev->dev);
57365732
rinse:
57375733
if (dangling_cfg_gpiod)
57385734
gpiod_put(cfg->ena_gpiod);

0 commit comments

Comments
 (0)