Hi Wei,
Thanks for the patch! I'll queue it up for v3.10
On Mon, Mar 11, 2013 at 7:27 PM, Wei Yongjun <weiyj.lk@xxxxxxxxx> wrote:
> From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
>
> In case of error, the function clk_get() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value
> check should be replaced with IS_ERR().
>
> Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
Acked-by: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx>
Regards,
--Prabhakar Lad
> ---
> drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
> index 7b35171..6a8222c 100644
> --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
> +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
> @@ -243,7 +243,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev)
>
> vpfe_dev->clks[i] =
> clk_get(vpfe_dev->pdev, vpfe_cfg->clocks[i]);
> - if (vpfe_dev->clks[i] == NULL) {
> + if (IS_ERR(vpfe_dev->clks[i])) {
> v4l2_err(vpfe_dev->pdev->driver,
> "Failed to get clock %s\n",
> vpfe_cfg->clocks[i]);
> @@ -264,7 +264,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev)
> return 0;
> out:
> for (i = 0; i < vpfe_cfg->num_clocks; i++)
> - if (vpfe_dev->clks[i]) {
> + if (!IS_ERR(vpfe_dev->clks[i])) {
> clk_disable_unprepare(vpfe_dev->clks[i]);
> clk_put(vpfe_dev->clks[i]);
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
