lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 402/633] i3c: master: Fix error return in cdns_i3c_master_probe()
    Date
    From: Jing Xiangfeng <jingxiangfeng@huawei.com>

    [ Upstream commit abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 ]

    Fix to return negative error code -ENOMEM from the error handling
    case instead of 0.

    Fixes: 603f2bee2c54 ("i3c: master: Add driver for Cadence IP")
    Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
    Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
    Link: https://lore.kernel.org/linux-i3c/20200911033350.23904-1-jingxiangfeng@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i3c/master/i3c-master-cdns.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c
    index 3fee8bd7fe20b..3f2226928fe05 100644
    --- a/drivers/i3c/master/i3c-master-cdns.c
    +++ b/drivers/i3c/master/i3c-master-cdns.c
    @@ -1635,8 +1635,10 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)
    master->ibi.slots = devm_kcalloc(&pdev->dev, master->ibi.num_slots,
    sizeof(*master->ibi.slots),
    GFP_KERNEL);
    - if (!master->ibi.slots)
    + if (!master->ibi.slots) {
    + ret = -ENOMEM;
    goto err_disable_sysclk;
    + }

    writel(IBIR_THR(1), master->regs + CMD_IBI_THR_CTRL);
    writel(MST_INT_IBIR_THR, master->regs + MST_IER);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:14    [W:4.133 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site