aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Rechberger <markus.rechberger@amd.com>2007-08-13 19:20:43 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 14:51:06 -0700
commit109f0e93b6b728f03c1eb4af02bc25d71b646c59 (patch)
tree3976e39808f95760a0ef3d022c59e358bacc8213
parentccd490a3c3d9c5960c738c2720fb2dc6830bc334 (diff)
Fix Firmware class name collision
following patch fixes the i2c name collision with i2c-dev. http://mcentral.de/wiki/index.php/Bugtracker#i2c_core_problem This issue has been experienced with em28xx and saa7133 based devices. I discussed that problem with Jean Delvare a while ago and he proposed to add a prefix to the class name. Signed-off-by: Markus Rechberger <markus.rechberger@amd.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/firmware_class.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4a1b9bfc547..0295855a3ee 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -292,8 +292,7 @@ firmware_class_timeout(u_long data)
static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
{
- /* XXX warning we should watch out for name collisions */
- strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
+ snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
}
static int fw_register_device(struct device **dev_p, const char *fw_name,