diff options
| author | Jing Xiangfeng <jingxiangfeng@huawei.com> | 2020-09-11 11:33:50 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:57:51 +0100 |
| commit | 56c30ffe5fcdcd87dcde8dd59f4a907198cc7e4f (patch) | |
| tree | fe205411c2ce4e7e01608e0ee94cc7d3fe29f66a /drivers/i3c/master | |
| parent | ebe1a014d7ed81f80e5224cb6c1539bf8faccb2c (diff) | |
| download | linux-56c30ffe5fcdcd87dcde8dd59f4a907198cc7e4f.tar.gz linux-56c30ffe5fcdcd87dcde8dd59f4a907198cc7e4f.tar.bz2 linux-56c30ffe5fcdcd87dcde8dd59f4a907198cc7e4f.zip | |
i3c: master: Fix error return in cdns_i3c_master_probe()
[ 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>
Diffstat (limited to 'drivers/i3c/master')
| -rw-r--r-- | drivers/i3c/master/i3c-master-cdns.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 10db0bf0655a..6d5719cea9f5 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -1593,8 +1593,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); |