Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 340bb4b7 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()" 



[ Upstream commit 6e800968f6a715c0661716d2ec5e1f56ed9f9c08 ]

This reverts commit 5f4b204b6b8153923d5be8002c5f7082985d153f.

Since rdev->dev now has a release() callback, the proper way of freeing
the initialized device can be restored.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/d7f469f3f7b1f0e1d52f9a7ede3f3c5703382090.1695077303.git.mirq-linux@rere.qmqm.pl


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7604e81

drivers/regulator/core.c

+1 −5
Original line number Diff line number Diff line
@@ -5351,15 +5351,11 @@ regulator_register(const struct regulator_desc *regulator_desc, 
	mutex_lock(&regulator_list_mutex);

	regulator_ena_gpio_free(rdev);

	mutex_unlock(&regulator_list_mutex);

	put_device(&rdev->dev);

	rdev = NULL;

clean:

	if (dangling_of_gpiod)

		gpiod_put(config->ena_gpiod);

	if (rdev && rdev->dev.of_node)

		of_node_put(rdev->dev.of_node);

	kfree(rdev);

	kfree(config);

	put_device(&rdev->dev);

rinse:

	if (dangling_cfg_gpiod)

		gpiod_put(cfg->ena_gpiod);