From 20a55ebc0eb77f3a6674b088f610562458c74ece Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Tue, 29 Jan 2008 15:35:01 -0600 Subject: [PATCH] --- yaml --- r: 84325 b: refs/heads/master c: 7d640c4a5b36c4733460065db1554da924044511 h: refs/heads/master i: 84323: 5712e423cfd7c5e0a64e784b14d74f8046451da9 v: v3 --- [refs] | 2 +- trunk/drivers/base/firmware_class.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3f8b4848c4b..3050dc107dc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4a00a2c06bc7802f52969cbdd19f4c680a7cd20 +refs/heads/master: 7d640c4a5b36c4733460065db1554da924044511 diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c index 0295855a3eef..4a1b9bfc5471 100644 --- a/trunk/drivers/base/firmware_class.c +++ b/trunk/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,