[PATCH] OPP: Fix missing cleanup on error in _opp_attach_genpd()

[PATCH] OPP: Fix missing cleanup on error in _opp_attach_genpd()

[Viresh Kumar]

The commit 2a56c462fe5a updated the code mistakenly to return directly
on errors, without doing the required cleanups. Fix it.

Fixes: 2a56c462fe5a ("OPP: Fix required_opp_tables for multiple genpds using same table")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202405180016.4fbn86bm-lkp@intel.com/
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/opp/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index cb4611fe1b5b..4e4d293bf5b1 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -2443,8 +2443,10 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev,
 		 * Cross check it again and fix if required.
 		 */
 		gdev = dev_to_genpd_dev(virt_dev);
-		if (IS_ERR(gdev))
-			return PTR_ERR(gdev);
+		if (IS_ERR(gdev)) {
+			ret = PTR_ERR(gdev);
+			goto err;
+		}
 
 		genpd_table = _find_opp_table(gdev);
 		if (!IS_ERR(genpd_table)) {
-- 
2.31.1.272.g89b43f80a514

Re: [PATCH] OPP: Fix missing cleanup on error in _opp_attach_genpd()

[Markus Elfring]

> The commit 2a56c462fe5a updated the code mistakenly …

Is there a need to reconsider data for such a commit reference?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc1#n99

Regards,
Markus

Re: [PATCH] OPP: Fix missing cleanup on error in _opp_attach_genpd()

[Viresh Kumar]

On 28-05-24, 08:20, Markus Elfring wrote:
> > The commit 2a56c462fe5a updated the code mistakenly …
> 
> Is there a need to reconsider data for such a commit reference?
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc1#n99

I didn't add it as it was already there as part of Fixes thing. I will
just drop the commit id from subject while applying to avoid the
duplication.

-- 
viresh