lkml.org 
[lkml]   [2019]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 067/148] drm/msm/dsi: Fix return value check for clk_get_parent
    Date
    From: Sean Paul <seanpaul@chromium.org>

    commit 5fb9b797d5ccf311ae4aba69e86080d47668b5f7 upstream.

    clk_get_parent returns an error pointer upon failure, not NULL. So the
    checks as they exist won't catch a failure. This patch changes the
    checks and the return values to properly handle an error pointer.

    Fixes: c4d8cfe516dc ("drm/msm/dsi: add implementation for helper functions")
    Cc: Sibi Sankar <sibis@codeaurora.org>
    Cc: Sean Paul <seanpaul@chromium.org>
    Cc: Rob Clark <robdclark@chromium.org>
    Cc: <stable@vger.kernel.org> # v4.19+
    Signed-off-by: Sean Paul <seanpaul@chromium.org>
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/msm/dsi/dsi_host.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/msm/dsi/dsi_host.c
    +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
    @@ -421,15 +421,15 @@ static int dsi_clk_init(struct msm_dsi_h
    }

    msm_host->byte_clk_src = clk_get_parent(msm_host->byte_clk);
    - if (!msm_host->byte_clk_src) {
    - ret = -ENODEV;
    + if (IS_ERR(msm_host->byte_clk_src)) {
    + ret = PTR_ERR(msm_host->byte_clk_src);
    pr_err("%s: can't find byte_clk clock. ret=%d\n", __func__, ret);
    goto exit;
    }

    msm_host->pixel_clk_src = clk_get_parent(msm_host->pixel_clk);
    - if (!msm_host->pixel_clk_src) {
    - ret = -ENODEV;
    + if (IS_ERR(msm_host->pixel_clk_src)) {
    + ret = PTR_ERR(msm_host->pixel_clk_src);
    pr_err("%s: can't find pixel_clk clock. ret=%d\n", __func__, ret);
    goto exit;
    }

    \
     
     \ /
      Last update: 2019-10-10 11:02    [W:2.891 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site