From: Jing Xiangfeng Date: Fri, 11 Sep 2020 03:33:50 +0000 (+0800) Subject: i3c: master: Fix error return in cdns_i3c_master_probe() X-Git-Tag: v5.10-rc1~93^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0;p=thirdparty%2Fkernel%2Flinux.git i3c: master: Fix error return in cdns_i3c_master_probe() 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 Signed-off-by: Boris Brezillon Link: https://lore.kernel.org/linux-i3c/20200911033350.23904-1-jingxiangfeng@huawei.com --- 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);