Driver core: Revert "Fix Firmware class name collision"
This reverts commit 109f0e93b6
.
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>
This commit is contained in:
parent
f4a00a2c06
commit
7d640c4a5b
1 changed files with 2 additions and 1 deletions
|
@ -292,7 +292,8 @@ firmware_class_timeout(u_long data)
|
||||||
|
|
||||||
static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
|
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,
|
static int fw_register_device(struct device **dev_p, const char *fw_name,
|
||||||
|
|
Loading…
Add table
Reference in a new issue