Skip to content

Commit

Permalink
i3c: master: Fix error return in cdns_i3c_master_probe()
Browse files Browse the repository at this point in the history
[ Upstream commit abea14b ]

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

Fixes: 603f2be ("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>
  • Loading branch information
hiss2018 authored and gregkh committed Oct 29, 2020
1 parent 69a4718 commit 0e486cc
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/i3c/master/i3c-master-cdns.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0e486cc

Please sign in to comment.