Commit 39329329565a5e24f0a5523eef3a9dd941e0b29d
1 parent
f7785a64d1
[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: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/sbus/sbus.c
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | sbus->ofdev.node = dp; |
| 234 | 234 | sbus->ofdev.dev.parent = NULL; |
| 235 | 235 | sbus->ofdev.dev.bus = &sbus_bus_type; |
| 236 | - strcpy(sbus->ofdev.dev.bus_id, dp->path_component_name); | |
| 236 | + sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus); | |
| 237 | 237 | |
| 238 | 238 | if (of_device_register(&sbus->ofdev) != 0) |
| 239 | 239 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", |