diff options
| author | Michał Mirosław | 2023-09-19 00:50:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-10-25 12:03:11 +0200 |
| commit | d63d39e7f95e7586507a0e196add71fd8c3d6d43 (patch) | |
| tree | 752c66425bf171edb5560a2aa5f91cc50bd3a936 | |
| parent | 2353f64762330cef00636b3584f413233a77c5a1 (diff) | |
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: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/d7f469f3f7b1f0e1d52f9a7ede3f3c5703382090.1695077303.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/regulator/core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f6a95f72af18..34d3d8281906 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5725,15 +5725,11 @@ wash: mutex_lock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); mutex_unlock(®ulator_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); |