aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/exynos-gsc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-11-26 01:20:19 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-21 07:24:23 -0500
commit9318ab69c50b82f9f513a20955ebd2cb1f482adc (patch)
tree5a2b558da9e4f9f60fb688e6f7ea4fa55ef44bdf /drivers/media/platform/exynos-gsc
parent2c8cc13f36b0563c62aa18454c8f853c287fdfe9 (diff)
[media] exynos-gsc: Rearrange error messages for valid prints
In case of clk_prepare failure, the function gsc_clk_get also prints "failed to get clock" which is not correct. Hence move the error messages to their respective blocks. While at it, also renamed the labels meaningfully. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/exynos-gsc')
-rw-r--r--drivers/media/platform/exynos-gsc/gsc-core.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 6d6f65d8c1e5..45bcfa7506db 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1017,25 +1017,26 @@ static int gsc_clk_get(struct gsc_dev *gsc)
1017 dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n"); 1017 dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n");
1018 1018
1019 gsc->clock = clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME); 1019 gsc->clock = clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);
1020 if (IS_ERR(gsc->clock)) 1020 if (IS_ERR(gsc->clock)) {
1021 goto err_print; 1021 dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n",
1022 GSC_CLOCK_GATE_NAME);
1023 goto err_clk_get;
1024 }
1022 1025
1023 ret = clk_prepare(gsc->clock); 1026 ret = clk_prepare(gsc->clock);
1024 if (ret < 0) { 1027 if (ret < 0) {
1028 dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
1029 GSC_CLOCK_GATE_NAME);
1025 clk_put(gsc->clock); 1030 clk_put(gsc->clock);
1026 gsc->clock = NULL; 1031 gsc->clock = NULL;
1027 goto err; 1032 goto err_clk_prepare;
1028 } 1033 }
1029 1034
1030 return 0; 1035 return 0;
1031 1036
1032err: 1037err_clk_prepare:
1033 dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
1034 GSC_CLOCK_GATE_NAME);
1035 gsc_clk_put(gsc); 1038 gsc_clk_put(gsc);
1036err_print: 1039err_clk_get:
1037 dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n",
1038 GSC_CLOCK_GATE_NAME);
1039 return -ENXIO; 1040 return -ENXIO;
1040} 1041}
1041 1042