From a109447d79ceea7b69dba2fa52c189e48081227b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 17 Jul 2006 21:06:15 -0700 Subject: [PATCH] --- yaml --- r: 32764 b: refs/heads/master c: 39329329565a5e24f0a5523eef3a9dd941e0b29d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/sbus/sbus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69fdb557aafc..80643f0ceae0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7785a64d117951e4c2bf9418d8c1dd59fe53b36 +refs/heads/master: 39329329565a5e24f0a5523eef3a9dd941e0b29d diff --git a/trunk/drivers/sbus/sbus.c b/trunk/drivers/sbus/sbus.c index 16b59773c0bb..935952ef88f1 100644 --- a/trunk/drivers/sbus/sbus.c +++ b/trunk/drivers/sbus/sbus.c @@ -233,7 +233,7 @@ static void __init build_one_sbus(struct device_node *dp, int num_sbus) sbus->ofdev.node = dp; sbus->ofdev.dev.parent = NULL; sbus->ofdev.dev.bus = &sbus_bus_type; - strcpy(sbus->ofdev.dev.bus_id, dp->path_component_name); + sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus); if (of_device_register(&sbus->ofdev) != 0) printk(KERN_DEBUG "sbus: device registration error for %s!\n",