diff options
| author | Linus Torvalds | 2020-10-17 11:01:01 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-10-17 11:01:01 -0700 |
| commit | 2a934b38c066ff221b08a9c703314a2a1c885dbd (patch) | |
| tree | aae627b3ab8931c535f86d9577149af592767954 /drivers/i3c/master | |
| parent | 6f78b9acf04fbf9ede7f4265e7282f9fb39d2c8c (diff) | |
| parent | abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 (diff) | |
Merge tag 'i3c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c updates from Boris Brezillon:
- Fix DAA for the pre-reserved address case
- Fix an error path in the cadence driver
* tag 'i3c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
i3c: master: Fix error return in cdns_i3c_master_probe()
i3c: master: fix for SETDASA and DAA process
i3c: master add i3c_master_attach_boardinfo to preserve boardinfo
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 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); |