diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:36:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:36:21 -0700 |
commit | 858cbcdd4f7a235f609249b9ca681b7ec5d786a3 (patch) | |
tree | ae91051bfcd25d4d1aa8c720d11305115c205114 /arch/sparc/kernel/of_device.c | |
parent | fe31eb679752369240fc8880858a5ed974554eb2 (diff) | |
parent | f5ef9d11fd255b30b455d18f8d721bc44cd1296b (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix bus_id[] string overflow.
Diffstat (limited to 'arch/sparc/kernel/of_device.c')
-rw-r--r-- | arch/sparc/kernel/of_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 74bef2a2d37f..46200c43ffb1 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c @@ -651,7 +651,7 @@ build_resources: if (!parent) strcpy(op->dev.bus_id, "root"); else - strcpy(op->dev.bus_id, dp->path_component_name); + sprintf(op->dev.bus_id, "%08x", dp->node); if (of_device_register(op)) { printk("%s: Could not register of device.\n", |