summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreric.gao@rock-chips.com <eric.gao@rock-chips.com>2017-04-20 12:45:53 +0800
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-05-16 00:15:59 +0200
commit666c81a3bbadf46ffd77e8f1c5bb6d76ceaf1d89 (patch)
tree716eecb115240af6931567fc74349afc679b5d29
parente8ea9eb29179cce4ae5b1fa66a6ac3a60c131394 (diff)
rockchip: video: vop: Fix rk_display_init() return error
The function clk_set_rate() will return it's input parameter, so it's return value in normal condition is nonzero. In this case, we should report error when it return zero rather than return a nonzero value. Signed-off-by: Eric Gao <eric.gao@rock-chips.com>
-rw-r--r--drivers/video/rockchip/rk_vop.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index bc02f800dc..0691fdf8cd 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -242,11 +242,13 @@ int rk_display_init(struct udevice *dev, ulong fbbase,
}
ret = clk_get_by_index(dev, 1, &clk);
- if (!ret)
+ if (!ret) {
ret = clk_set_rate(&clk, timing.pixelclock.typ);
- if (ret) {
- debug("%s: Failed to set pixel clock: ret=%d\n", __func__, ret);
- return ret;
+ if (!ret) {
+ debug("%s: Failed to set pixel clock: ret=%d\n",
+ __func__, ret);
+ return ret;
+ }
}
rkvop_mode_set(regs, &timing, vop_id);