Commit:     7d640c4a5b36c4733460065db1554da924044511
Parent:     f4a00a2c06bc7802f52969cbdd19f4c680a7cd20
Author:     Michael E Brown <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 29 15:35:01 2008 -0600
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 11:31:46 2008 -0800

    Driver core: Revert "Fix Firmware class name collision"
    This reverts commit 109f0e93b6b728f03c1eb4af02bc25d71b646c59.
    The original patch breaks BIOS updates on all Dell machines. The path to
    the firmware file for the dell_rbu driver changes, which breaks all of
    the userspace tools which rely on it.
    Note that this patch re-introduces a problem with i2c name collision
    that was previously fixed by this patch.
    Signed-off-by: Michael E Brown <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/base/firmware_class.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 0295855..4a1b9bf 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,
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