]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ep93xx: clock: Do not return the address of the freed memory
authorGenjian Zhang <zhanggenjian123@gmail.com>
Tue, 17 May 2022 07:39:46 +0000 (15:39 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 16:41:21 +0000 (18:41 +0200)
[ Upstream commit 8a7322a3a05f75e8a4902bdf8129aecd37d54fe9 ]

Avoid return freed memory addresses,Modified to the actual error
return value of clk_register().

Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/mach-ep93xx/clock.c

index 28e0ae6e890e5b16759a4b639e62b767a8891897..00c2db101ce55c35d7d1832a6a75ca7241dd8982 100644 (file)
@@ -345,9 +345,10 @@ static struct clk_hw *clk_hw_register_ddiv(const char *name,
        psc->hw.init = &init;
 
        clk = clk_register(NULL, &psc->hw);
-       if (IS_ERR(clk))
+       if (IS_ERR(clk)) {
                kfree(psc);
-
+               return ERR_CAST(clk);
+       }
        return &psc->hw;
 }
 
@@ -452,9 +453,10 @@ static struct clk_hw *clk_hw_register_div(const char *name,
        psc->hw.init = &init;
 
        clk = clk_register(NULL, &psc->hw);
-       if (IS_ERR(clk))
+       if (IS_ERR(clk)) {
                kfree(psc);
-
+               return ERR_CAST(clk);
+       }
        return &psc->hw;
 }