Commit a68b5bb6 authored by Chris Zhong's avatar Chris Zhong Committed by Sean Paul

drm/rockchip: cdn-dp: return error code when clk_get_rate failed

The clk_get_rate return 0 if something goes wrong, so it can never be
less then zero, the ret should be set a error code, otherwise the
cdn_dp_clk_enable will return 0 when it failed at clk_get_rate.
In addition, clk_get_rate() returns an "unsigned long", so use
"unsigned long" instead of "u32" is better.
Signed-off-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1488940077-22297-2-git-send-email-zyw@rock-chips.com
parent a4521654
...@@ -94,7 +94,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, ...@@ -94,7 +94,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
static int cdn_dp_clk_enable(struct cdn_dp_device *dp) static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
{ {
int ret; int ret;
u32 rate; unsigned long rate;
ret = clk_prepare_enable(dp->pclk); ret = clk_prepare_enable(dp->pclk);
if (ret < 0) { if (ret < 0) {
...@@ -123,7 +123,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp) ...@@ -123,7 +123,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
rate = clk_get_rate(dp->core_clk); rate = clk_get_rate(dp->core_clk);
if (!rate) { if (!rate) {
DRM_DEV_ERROR(dp->dev, "get clk rate failed: %d\n", rate); DRM_DEV_ERROR(dp->dev, "get clk rate failed\n");
ret = -EINVAL;
goto err_set_rate; goto err_set_rate;
} }
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LINK_TRAINING_RETRY_MS 20 #define LINK_TRAINING_RETRY_MS 20
#define LINK_TRAINING_TIMEOUT_MS 500 #define LINK_TRAINING_TIMEOUT_MS 500
void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, u32 clk) void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk)
{ {
writel(clk / 1000000, dp->regs + SW_CLK_H); writel(clk / 1000000, dp->regs + SW_CLK_H);
} }
......
...@@ -462,7 +462,7 @@ enum vic_bt_type { ...@@ -462,7 +462,7 @@ enum vic_bt_type {
void cdn_dp_clock_reset(struct cdn_dp_device *dp); void cdn_dp_clock_reset(struct cdn_dp_device *dp);
void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, u32 clk); void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk);
int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem, int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem,
u32 i_size, const u32 *d_mem, u32 d_size); u32 i_size, const u32 *d_mem, u32 d_size);
int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable); int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment