|
Takashi Iwai |
2e5cf5 |
From 855ae87a2073ebf1b395e020de54fdf9ce7d166f Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
2e5cf5 |
From: Lin Yujun <linyujun809@huawei.com>
|
|
Takashi Iwai |
2e5cf5 |
Date: Wed, 14 Sep 2022 11:32:06 +0800
|
|
Takashi Iwai |
2e5cf5 |
Subject: [PATCH] clk: imx: scu: fix memleak on platform_device_add() fails
|
|
Takashi Iwai |
2e5cf5 |
Git-commit: 855ae87a2073ebf1b395e020de54fdf9ce7d166f
|
|
Takashi Iwai |
2e5cf5 |
Patch-mainline: v6.1-rc1
|
|
Takashi Iwai |
2e5cf5 |
References: git-fixes
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
No error handling is performed when platform_device_add()
|
|
Takashi Iwai |
2e5cf5 |
fails. Add error processing before return, and modified
|
|
Takashi Iwai |
2e5cf5 |
the return value.
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
Fixes: 77d8f3068c63 ("clk: imx: scu: add two cells binding support")
|
|
Takashi Iwai |
2e5cf5 |
Signed-off-by: Lin Yujun <linyujun809@huawei.com>
|
|
Takashi Iwai |
2e5cf5 |
Link: https://lore.kernel.org/r/20220914033206.98046-1-linyujun809@huawei.com
|
|
Takashi Iwai |
2e5cf5 |
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
|
Takashi Iwai |
2e5cf5 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
---
|
|
Takashi Iwai |
2e5cf5 |
drivers/clk/imx/clk-scu.c | 6 +++++-
|
|
Takashi Iwai |
2e5cf5 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c
|
|
Takashi Iwai |
2e5cf5 |
index c56e406138db..1e6870f3671f 100644
|
|
Takashi Iwai |
2e5cf5 |
--- a/drivers/clk/imx/clk-scu.c
|
|
Takashi Iwai |
2e5cf5 |
+++ b/drivers/clk/imx/clk-scu.c
|
|
Takashi Iwai |
2e5cf5 |
@@ -695,7 +695,11 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name,
|
|
Takashi Iwai |
2e5cf5 |
pr_warn("%s: failed to attached the power domain %d\n",
|
|
Takashi Iwai |
2e5cf5 |
name, ret);
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
- platform_device_add(pdev);
|
|
Takashi Iwai |
2e5cf5 |
+ ret = platform_device_add(pdev);
|
|
Takashi Iwai |
2e5cf5 |
+ if (ret) {
|
|
Takashi Iwai |
2e5cf5 |
+ platform_device_put(pdev);
|
|
Takashi Iwai |
2e5cf5 |
+ return ERR_PTR(ret);
|
|
Takashi Iwai |
2e5cf5 |
+ }
|
|
Takashi Iwai |
2e5cf5 |
|
|
Takashi Iwai |
2e5cf5 |
/* For API backwards compatiblilty, simply return NULL for success */
|
|
Takashi Iwai |
2e5cf5 |
return NULL;
|
|
Takashi Iwai |
2e5cf5 |
--
|
|
Takashi Iwai |
2e5cf5 |
2.35.3
|
|
Takashi Iwai |
2e5cf5 |
|