Driver core: Revert "Fix Firmware class name collision"
authorMichael E Brown <Michael_E_Brown@dell.com>
Tue, 29 Jan 2008 21:35:01 +0000 (15:35 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 7 Feb 2008 19:31:46 +0000 (11:31 -0800)
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>
drivers/base/firmware_class.c

index 0295855a3eefe58ddf48bc9061123e3177be67f8..4a1b9bfc5471fe91ade02cedfaab22f6cec0d636 100644 (file)
@@ -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,