Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'i3c/fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c fixes from Boris Brezillon:
- Fix the error check on master->sysclk val in the Cadence driver
- Fix reattach implementation in the Designware driver
* tag 'i3c/fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
i3c: master: dw-i3c-master: fix i3c_attach/reattach
i3c: master: Fix an error checking typo in 'cdns_i3c_master_probe()'
+4
-7
+2
-5
drivers/i3c/master/dw-i3c-master.c
+2
-5
drivers/i3c/master/dw-i3c-master.c
···
901
901
master->regs +
902
902
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
903
903
904
-
if (!old_dyn_addr)
905
-
return 0;
906
-
907
904
master->addrs[data->index] = dev->info.dyn_addr;
908
905
909
906
return 0;
···
922
925
return -ENOMEM;
923
926
924
927
data->index = pos;
925
-
master->addrs[pos] = dev->info.dyn_addr;
928
+
master->addrs[pos] = dev->info.dyn_addr ? : dev->info.static_addr;
926
929
master->free_pos &= ~BIT(pos);
927
930
i3c_dev_set_master_data(dev, data);
928
931
929
-
writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(dev->info.dyn_addr),
932
+
writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(master->addrs[pos]),
930
933
master->regs +
931
934
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
932
935
+2
-2
drivers/i3c/master/i3c-master-cdns.c
+2
-2
drivers/i3c/master/i3c-master-cdns.c
···
1556
1556
return PTR_ERR(master->pclk);
1557
1557
1558
1558
master->sysclk = devm_clk_get(&pdev->dev, "sysclk");
1559
-
if (IS_ERR(master->pclk))
1560
-
return PTR_ERR(master->pclk);
1559
+
if (IS_ERR(master->sysclk))
1560
+
return PTR_ERR(master->sysclk);
1561
1561
1562
1562
irq = platform_get_irq(pdev, 0);
1563
1563
if (irq < 0)