Commit 4b75eb2b authored by David S. Miller's avatar David S. Miller

[SPARC64]: Fix of_device bus_id settings.

They have to be unique system-wide, so use
"NAME@NODE" as the string pattern of the non-root
nodes.

Thanks to Andrew Morton for fixing the error value
checking in bus_add_device() which made this problem
finally noticable.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99ae1c83
...@@ -841,7 +841,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, ...@@ -841,7 +841,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
if (!parent) if (!parent)
strcpy(op->dev.bus_id, "root"); strcpy(op->dev.bus_id, "root");
else else
strcpy(op->dev.bus_id, dp->path_component_name); sprintf(op->dev.bus_id, "%s@%08x", dp->name, dp->node);
if (of_device_register(op)) { if (of_device_register(op)) {
printk("%s: Could not register of device.\n", printk("%s: Could not register of device.\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment