* [PATCH] media: i2c: mt9p031: Check return value of clk_prepare_enable/clk_set_rate
@ 2014-01-17 9:17 Prabhakar Lad
2014-01-19 19:37 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Prabhakar Lad @ 2014-01-17 9:17 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: LMML, LKML, Lad, Prabhakar
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
clk_set_rate(), clk_prepare_enable() functions can fail, so check the return
values to avoid surprises.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/i2c/mt9p031.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index e5ddf47..dbe34d7 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -222,12 +222,15 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031)
struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
struct mt9p031_platform_data *pdata = mt9p031->pdata;
+ int ret;
mt9p031->clk = devm_clk_get(&client->dev, NULL);
if (IS_ERR(mt9p031->clk))
return PTR_ERR(mt9p031->clk);
- clk_set_rate(mt9p031->clk, pdata->ext_freq);
+ ret = clk_set_rate(mt9p031->clk, pdata->ext_freq);
+ if (ret < 0)
+ return ret;
mt9p031->pll.ext_clock = pdata->ext_freq;
mt9p031->pll.pix_clock = pdata->target_freq;
@@ -286,8 +289,11 @@ static int mt9p031_power_on(struct mt9p031 *mt9p031)
return ret;
/* Emable clock */
- if (mt9p031->clk)
- clk_prepare_enable(mt9p031->clk);
+ if (mt9p031->clk) {
+ ret = clk_prepare_enable(mt9p031->clk);
+ if (ret)
+ return ret;
+ }
/* Now RESET_BAR must be high */
if (gpio_is_valid(mt9p031->reset)) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: i2c: mt9p031: Check return value of clk_prepare_enable/clk_set_rate
2014-01-17 9:17 [PATCH] media: i2c: mt9p031: Check return value of clk_prepare_enable/clk_set_rate Prabhakar Lad
@ 2014-01-19 19:37 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2014-01-19 19:37 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: LMML, LKML
Hi Prabhakar,
Thank you for the patch.
On Friday 17 January 2014 14:47:33 Prabhakar Lad wrote:
> From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
>
> clk_set_rate(), clk_prepare_enable() functions can fail, so check the return
> values to avoid surprises.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> ---
> drivers/media/i2c/mt9p031.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
> index e5ddf47..dbe34d7 100644
> --- a/drivers/media/i2c/mt9p031.c
> +++ b/drivers/media/i2c/mt9p031.c
> @@ -222,12 +222,15 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031)
>
> struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
> struct mt9p031_platform_data *pdata = mt9p031->pdata;
> + int ret;
>
> mt9p031->clk = devm_clk_get(&client->dev, NULL);
> if (IS_ERR(mt9p031->clk))
> return PTR_ERR(mt9p031->clk);
>
> - clk_set_rate(mt9p031->clk, pdata->ext_freq);
> + ret = clk_set_rate(mt9p031->clk, pdata->ext_freq);
> + if (ret < 0)
> + return ret;
>
> mt9p031->pll.ext_clock = pdata->ext_freq;
> mt9p031->pll.pix_clock = pdata->target_freq;
> @@ -286,8 +289,11 @@ static int mt9p031_power_on(struct mt9p031 *mt9p031)
> return ret;
>
> /* Emable clock */
> - if (mt9p031->clk)
> - clk_prepare_enable(mt9p031->clk);
> + if (mt9p031->clk) {
> + ret = clk_prepare_enable(mt9p031->clk);
> + if (ret)
> + return ret;
You should call regulator_bulk_disable() in the error path to cancel the
previous regulator_bulk_enable() call.
> + }
>
> /* Now RESET_BAR must be high */
> if (gpio_is_valid(mt9p031->reset)) {
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-19 19:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-17 9:17 [PATCH] media: i2c: mt9p031: Check return value of clk_prepare_enable/clk_set_rate Prabhakar Lad
2014-01-19 19:37 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).