From 71591e87172bda0d1bf239dd4c7f9aef57a69c28 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Tue, 29 Jan 2008 15:35:01 -0600 Subject: [PATCH] Driver core: Revert "Fix Firmware class name collision" patch 7d640c4a5b36c4733460065db1554da924044511 in mainline. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_class.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, -- 2.39.5