]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: marvell: Add check for clk_enable()
authorJiasheng Jiang <jiashengjiangcool@gmail.com>
Tue, 3 Dec 2024 21:29:02 +0000 (21:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:50:08 +0000 (12:50 +0100)
[ Upstream commit 11f68d2ba2e1521a608af773bf788e8cfa260f68 ]

Add check for the return value of clk_enable() to guarantee the success.

Fixes: 81a409bfd551 ("media: marvell-ccic: provide a clock for the sensor")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
[Sakari Ailus: Fix spelling in commit message.]
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/marvell-ccic/mcam-core.c

index 58f9463f3b8ce558386e7521e97c15d32b8305f1..a8d3ed5dc206f047a5e6153a4924e0816144b5cb 100644 (file)
@@ -935,7 +935,12 @@ static int mclk_enable(struct clk_hw *hw)
        ret = pm_runtime_resume_and_get(cam->dev);
        if (ret < 0)
                return ret;
-       clk_enable(cam->clk[0]);
+       ret = clk_enable(cam->clk[0]);
+       if (ret) {
+               pm_runtime_put(cam->dev);
+               return ret;
+       }
+
        mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div);
        mcam_ctlr_power_up(cam);