[PATCH] i3c: master: Fix error return in cdns_i3c_master_probe()

Boris Brezillon boris.brezillon at collabora.com
Wed Oct 7 09:15:34 EDT 2020


On Fri, 11 Sep 2020 11:33:50 +0800
Jing Xiangfeng <jingxiangfeng at huawei.com> wrote:

> Fix to return negative error code -ENOMEM from the error handling
> case instead of 0.
> 
> Signed-off-by: Jing Xiangfeng <jingxiangfeng at huawei.com>

Queued to i3c/next.

Thanks,

Boris

> ---
>  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 3fee8bd7fe20..3f2226928fe0 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);




More information about the linux-i3c mailing list