Commit:     109f0e93b6b728f03c1eb4af02bc25d71b646c59
Parent:     ccd490a3c3d9c5960c738c2720fb2dc6830bc334
Author:     Markus Rechberger <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 13 19:20:43 2007 +0200
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 14:51:06 2007 -0700

    Fix Firmware class name collision
    following patch fixes the i2c name collision with i2c-dev.
    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 <[EMAIL PROTECTED]>
    Acked-by: Marcel Holtmann <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/base/firmware_class.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4a1b9bf..0295855 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,
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to