aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBilly Tsai <billy_tsai@aspeedtech.com>2026-01-12 14:07:22 +0800
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2026-01-14 15:57:23 +0100
commit3502cea99c7ceb331458cbd34ef6792c83144687 (patch)
treec663cf1724b984c6fd1833ad90f7fa36e11145d2 /drivers
parente7218986319b4e903dfb4642dcbd1087cf16aaec (diff)
i3c: Move device name assignment after i3c_bus_init
Move device name initialization to occur after i3c_bus_init() so that i3cbus->id is guaranteed to be assigned before it is used. Fixes: 9d4f219807d5 ("i3c: fix refcount inconsistency in i3c_master_register") Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Link: https://patch.msgid.link/20260112-upstream_i3c_fix-v1-1-cbbf2cb71809@aspeedtech.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i3c/master.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index e551b1de5d7b..3bc8b4abf8af 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -2911,7 +2911,6 @@ int i3c_master_register(struct i3c_master_controller *master,
INIT_LIST_HEAD(&master->boardinfo.i3c);
device_initialize(&master->dev);
- dev_set_name(&master->dev, "i3c-%d", i3cbus->id);
master->dev.dma_mask = parent->dma_mask;
master->dev.coherent_dma_mask = parent->coherent_dma_mask;
@@ -2921,6 +2920,8 @@ int i3c_master_register(struct i3c_master_controller *master,
if (ret)
goto err_put_dev;
+ dev_set_name(&master->dev, "i3c-%d", i3cbus->id);
+
ret = of_populate_i3c_bus(master);
if (ret)
goto err_put_dev;