aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMichael E Brown <Michael_E_Brown@dell.com>2008-01-29 16:35:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-07 14:31:46 -0500
commit7d640c4a5b36c4733460065db1554da924044511 (patch)
tree6ab503d57bec89f011b7f034648afbffd4918b9a /drivers/base
parentf4a00a2c06bc7802f52969cbdd19f4c680a7cd20 (diff)
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 <michael_e_brown@dell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/firmware_class.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 0295855a3eef..4a1b9bfc5471 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -292,7 +292,8 @@ firmware_class_timeout(u_long data)
292 292
293static inline void fw_setup_device_id(struct device *f_dev, struct device *dev) 293static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
294{ 294{
295 snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id); 295 /* XXX warning we should watch out for name collisions */
296 strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
296} 297}
297 298
298static int fw_register_device(struct device **dev_p, const char *fw_name, 299static int fw_register_device(struct device **dev_p, const char *fw_name,