X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Ffirmware_class.c;h=4a1b9bfc5471fe91ade02cedfaab22f6cec0d636;hb=7a6d84c1b26fd8a1deb28a4bbed672959f7f26ae;hp=0295855a3eefe58ddf48bc9061123e3177be67f8;hpb=c4ec20717313daafba59225f812db89595952b83;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 0295855a3ee..4a1b9bfc547 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -292,7 +292,8 @@ firmware_class_timeout(u_long data)
 
 static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
 {
-	snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
+	/* XXX warning we should watch out for name collisions */
+	strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
 }
 
 static int fw_register_device(struct device **dev_p, const char *fw_name,