diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-07-18 00:06:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-21 17:18:06 -0400 |
| commit | 39329329565a5e24f0a5523eef3a9dd941e0b29d (patch) | |
| tree | 9b2a6207d73701d375e2cc4f57a34f72994071c7 /drivers/sbus/sbus.c | |
| parent | f7785a64d117951e4c2bf9418d8c1dd59fe53b36 (diff) | |
[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>
Diffstat (limited to 'drivers/sbus/sbus.c')
| -rw-r--r-- | drivers/sbus/sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 16b59773c0bb..935952ef88f1 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c | |||
| @@ -233,7 +233,7 @@ static void __init build_one_sbus(struct device_node *dp, int num_sbus) | |||
| 233 | sbus->ofdev.node = dp; | 233 | sbus->ofdev.node = dp; |
| 234 | sbus->ofdev.dev.parent = NULL; | 234 | sbus->ofdev.dev.parent = NULL; |
| 235 | sbus->ofdev.dev.bus = &sbus_bus_type; | 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 | if (of_device_register(&sbus->ofdev) != 0) | 238 | if (of_device_register(&sbus->ofdev) != 0) |
| 239 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", | 239 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", |