Commit 3502cea9 authored by Billy Tsai's avatar Billy Tsai Committed by Alexandre Belloni
Browse files

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: 9d4f2198 ("i3c: fix refcount inconsistency in i3c_master_register")
Signed-off-by: default avatarBilly Tsai <billy_tsai@aspeedtech.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260112-upstream_i3c_fix-v1-1-cbbf2cb71809@aspeedtech.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent e7218986

drivers/i3c/master.c

+2 −1
Original line number Diff line number Diff line
@@ -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;