lkml.org 
[lkml]   [2021]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 132/151] drm/msm/a3xx: fix error handling in a3xx_gpu_init()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 3eda901995371d390ef82d0b6462f4ea8efbcfdf upstream.

    These error paths returned 1 on failure, instead of a negative error
    code. This would lead to an Oops in the caller. A second problem is
    that the check for "if (ret != -ENODATA)" did not work because "ret" was
    set to 1.

    Fixes: 5785dd7a8ef0 ("drm/msm: Fix duplicate gpu node in icc summary")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/20211001125904.GK2283@kili
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
    +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
    @@ -571,13 +571,14 @@ struct msm_gpu *a3xx_gpu_init(struct drm
    }

    icc_path = devm_of_icc_get(&pdev->dev, "gfx-mem");
    - ret = IS_ERR(icc_path);
    - if (ret)
    + if (IS_ERR(icc_path)) {
    + ret = PTR_ERR(icc_path);
    goto fail;
    + }

    ocmem_icc_path = devm_of_icc_get(&pdev->dev, "ocmem");
    - ret = IS_ERR(ocmem_icc_path);
    - if (ret) {
    + if (IS_ERR(ocmem_icc_path)) {
    + ret = PTR_ERR(ocmem_icc_path);
    /* allow -ENODATA, ocmem icc is optional */
    if (ret != -ENODATA)
    goto fail;

    \
     
     \ /
      Last update: 2021-10-18 16:03    [W:4.378 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site