diff options
| author | Michael E Brown <Michael_E_Brown@dell.com> | 2008-01-29 15:35:01 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-07 11:31:46 -0800 |
| commit | 7d640c4a5b36c4733460065db1554da924044511 (patch) | |
| tree | 6ab503d57bec89f011b7f034648afbffd4918b9a /drivers/base | |
| parent | f4a00a2c06bc7802f52969cbdd19f4c680a7cd20 (diff) | |
| download | linux-rpi-7d640c4a5b36c4733460065db1554da924044511.tar.gz linux-rpi-7d640c4a5b36c4733460065db1554da924044511.tar.bz2 linux-rpi-7d640c4a5b36c4733460065db1554da924044511.zip | |
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.c | 3 |
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) 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, |