Skip to contentSkip to conversation

i3c: Move device name assignment after i3c_bus_init

PATCH Applied Billy Tsai 3 participants 3 messages Jan 12 – Jan 14 I3C

lore
Share & tools
lore

Billy Tsai

author
#0 lore raw

PATCH 1/1 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")
---
 drivers/i3c/master.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i3c/master.c +2 -1
index 7f606c871648..1bc3c9068402 100644
@@ -2881,7 +2881,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;
@@ -2891,6 +2890,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;

---
base-commit: 9c7ef209cd0f7c1a92ed61eed3e835d6e4abc66c
change-id: 20260112-upstream_i3c_fix-455a2cc442a5

Best regards,

Signature · 1 line
Billy Tsai <[email protected]>
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Billy Tsai

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")

---

Quoted 33 lines
 drivers/i3c/master.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i3c/master.c +2 -2
index 7f606c871648..1bc3c9068402 100644
@@ -2881,7 +2881,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;
@@ -2891,6 +2890,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;
 
---

base-commit: 9c7ef209cd0f7c1a92ed61eed3e835d6e4abc66c
change-id: 20260112-upstream_i3c_fix-455a2cc442a5

Best regards,
--
Billy Tsai <[email protected]>

maintainer Applied
#2 lore raw
In reply to Billy Tsai
Quoted 4 lines · Billy Tsai

Move device name initialization to occur after i3c_bus_init() so that i3cbus->id is guaranteed to be assigned before it is used.

Applied, thanks!

[1/1] i3c: Move device name assignment after i3c_bus_init

      https://git.kernel.org/i3c/c/3502cea99c7c

Best regards,

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com