media: tegra_camera: check ERR or NULL for clk

clk struct might be ERR or NULL in the pointer returned from
clk_get(). It should be checked by IS_ERR_OR_NULL().

Bug 1654140

Change-Id: I0debc3fd8172390efc8fa99ab048a36082847c89
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/768146
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: David Wang (SW-TEGRA) <davidw@nvidia.com>
Reviewed-by: Jihoon Bang <jbang@nvidia.com>

diff --git a/drivers/media/platform/soc_camera/tegra_camera/vi2.c b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
index 45339bbf378f70f7e42e5385c647dc659f3ddeca..94509d6031787702797f94a32daf795007e6cdac 100644 (file)
--- a/drivers/media/platform/soc_camera/tegra_camera/vi2.c
+++ b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
@@ -497,7 +497,7 @@ static int vi2_clock_start(struct vi2_camera *vi2_cam,
                } else
                        vi2_clk->clk = clk_get(&pdev->dev, vi2_clk->name);
 
-               if (!IS_ERR(vi2_clk->clk)) {
+               if (!IS_ERR_OR_NULL(vi2_clk->clk)) {
                        clk_prepare_enable(vi2_clk->clk);
                        if (vi2_clk->freq > 0)
                                clk_set_rate(vi2_clk->clk, vi2_clk->freq);
@@ -544,7 +544,7 @@ static void vi2_clock_stop(struct vi2_camera_clk *clks, int num_clks)
 
        for (i = 0; i < num_clks; i++) {
                vi2_clk = &clks[i];
-               if (!IS_ERR(vi2_clk->clk)) {
+               if (!IS_ERR_OR_NULL(vi2_clk->clk)) {
                        clk_disable_unprepare(vi2_clk->clk);
                        clk_put(vi2_clk->clk);
                }