From: Sean Paul <seanp...@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 <si...@codeaurora.org>
Cc: Sean Paul <seanp...@chromium.org>
Cc: Rob Clark <robdcl...@chromium.org>
Cc: <sta...@vger.kernel.org> # v4.19+
Signed-off-by: Sean Paul <seanp...@chromium.org>
Signed-off-by: Rob Clark <robdcl...@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gre...@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;
        }


Reply via email to