diff options
| author | Jiasheng Jiang <jiashengjiangcool@gmail.com> | 2024-12-03 21:29:02 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-08 09:57:53 +0100 |
| commit | c3e18562b65c1687e4c03b485e5d5b36f575d2d1 (patch) | |
| tree | 98cab16c0861044cce530e608b6098fa9dcd172d /drivers/media | |
| parent | 26d8d3d57ce30cbbf06efcf60cfb5d842a575a70 (diff) | |
| download | linux-c3e18562b65c1687e4c03b485e5d5b36f575d2d1.tar.gz linux-c3e18562b65c1687e4c03b485e5d5b36f575d2d1.tar.bz2 linux-c3e18562b65c1687e4c03b485e5d5b36f575d2d1.zip | |
media: marvell: Add check for clk_enable()
[ 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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/marvell/mcam-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/platform/marvell/mcam-core.c b/drivers/media/platform/marvell/mcam-core.c index c81593c969e0..a62c3a484cb3 100644 --- a/drivers/media/platform/marvell/mcam-core.c +++ b/drivers/media/platform/marvell/mcam-core.c @@ -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); |