lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 562/862] slimbus: qcom-ngd: Add error handling in of_qcom_slim_ngd_register
    Date
    From: Lin Yujun <linyujun809@huawei.com>

    [ Upstream commit 42992cf187e4e4bcfe3c58f8fc7b1832c5652d9f ]

    No error handling is performed when platform_device_add()
    return fails. Refer to the error handling of driver_set_override(),
    add error handling for platform_device_add().

    Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver")
    Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
    Signed-off-by: Lin Yujun <linyujun809@huawei.com>
    Link: https://lore.kernel.org/r/20220914031953.94061-1-linyujun809@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/slimbus/qcom-ngd-ctrl.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
    index bacc6af1d51e..d29a1a9cf12f 100644
    --- a/drivers/slimbus/qcom-ngd-ctrl.c
    +++ b/drivers/slimbus/qcom-ngd-ctrl.c
    @@ -1470,7 +1470,13 @@ static int of_qcom_slim_ngd_register(struct device *parent,
    ngd->pdev->dev.of_node = node;
    ctrl->ngd = ngd;

    - platform_device_add(ngd->pdev);
    + ret = platform_device_add(ngd->pdev);
    + if (ret) {
    + platform_device_put(ngd->pdev);
    + kfree(ngd);
    + of_node_put(node);
    + return ret;
    + }
    ngd->base = ctrl->base + ngd->id * data->offset +
    (ngd->id - 1) * data->size;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 13:54    [W:4.110 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site