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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/sbus/sbus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 935952ef88f..98fcbb3d556 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c @@ -61,11 +61,11 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde else sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev; sdev->ofdev.dev.bus = &sbus_bus_type; - strcpy(sdev->ofdev.dev.bus_id, dp->path_component_name); + sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node); if (of_device_register(&sdev->ofdev) != 0) printk(KERN_DEBUG "sbus: device registration error for %s!\n", - sdev->ofdev.dev.bus_id); + dp->path_component_name); } static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus) |