Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39329329 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC] sbus: Make sure sbus nodes are named uniquely. 



Just name them "sbus%d" otherwise on sun4d we try to register
multiple entries named "sbi@0,0" which does not work.

Based upon a report from Raymond Burns.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7785a64

drivers/sbus/sbus.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,7 @@ static void __init build_one_sbus(struct device_node *dp, int num_sbus) 
	sbus->ofdev.node = dp;

	sbus->ofdev.node = dp;

	sbus->ofdev.dev.parent = NULL;

	sbus->ofdev.dev.parent = NULL;

	sbus->ofdev.dev.bus = &sbus_bus_type;

	sbus->ofdev.dev.bus = &sbus_bus_type;

	strcpy(sbus->ofdev.dev.bus_id, dp->path_component_name);

	sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus);





	if (of_device_register(&sbus->ofdev) != 0)

	if (of_device_register(&sbus->ofdev) != 0)

		printk(KERN_DEBUG "sbus: device registration error for %s!\n",

		printk(KERN_DEBUG "sbus: device registration error for %s!\n",