From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
To: krzk@kernel.org
Cc: sylvester.nawrocki@gmail.com, mchehab@kernel.org,
dron0gus@gmail.com, tomasz.figa@gmail.com,
alim.akhtar@samsung.com, kyungmin.park@samsung.com,
laurent.pinchart@ideasonboard.com, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiasheng Jiang <jiashengjiangcool@gmail.com>
Subject: [PATCH RESEND v3 1/2] media: mipi-csis: Add check for clk_enable()
Date: Sat, 23 Nov 2024 21:26:24 +0000 [thread overview]
Message-ID: <20241123212624.6237-2-jiashengjiangcool@gmail.com> (raw)
In-Reply-To: <20241123212624.6237-1-jiashengjiangcool@gmail.com>
Add check for the return value of clk_enable() to gurantee the success.
Fixes: b5f1220d587d ("[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
Changelog:
v2 -> v3:
1. Correct alignment to match open parenthesis
v1 -> v2:
1. Power off the phy and disble regulators when clk_enable() fails.
2. Remove a redundant space before the label "unlock".
---
drivers/media/platform/samsung/exynos4-is/mipi-csis.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
index 63f3eecdd7e6..452880b5350c 100644
--- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
@@ -940,13 +940,19 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime)
state->supplies);
goto unlock;
}
- clk_enable(state->clock[CSIS_CLK_GATE]);
+ ret = clk_enable(state->clock[CSIS_CLK_GATE]);
+ if (ret) {
+ phy_power_off(state->phy);
+ regulator_bulk_disable(CSIS_NUM_SUPPLIES,
+ state->supplies);
+ goto unlock;
+ }
}
if (state->flags & ST_STREAMING)
s5pcsis_start_stream(state);
state->flags &= ~ST_SUSPENDED;
- unlock:
+unlock:
mutex_unlock(&state->lock);
return ret ? -EAGAIN : 0;
}
--
2.25.1
next prev parent reply other threads:[~2024-11-23 21:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 21:26 [PATCH 2/2] media: camif-core: Add check for clk_enable() Jiasheng Jiang
2024-11-23 21:26 ` Jiasheng Jiang [this message]
2024-11-24 10:50 ` Krzysztof Kozlowski
2024-11-24 21:10 ` Jiasheng Jiang
2024-11-25 7:27 ` Krzysztof Kozlowski
2024-11-25 19:19 ` Jiasheng Jiang
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 19:18 [PATCH RESEND v3 " Jiasheng Jiang
2024-11-25 19:18 ` [PATCH RESEND v3 1/2] media: mipi-csis: " Jiasheng Jiang
2024-11-29 11:29 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241123212624.6237-2-jiashengjiangcool@gmail.com \
--to=jiashengjiangcool@gmail.com \
--cc=alim.akhtar@samsung.com \
--cc=dron0gus@gmail.com \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sylvester.nawrocki@gmail.com \
--cc=tomasz.figa@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox