LKML Archive on
help / color / mirror / Atom feed
From: Greg Kroah-Hartman <>
Cc: Michael E Brown <>,
	Michael E Brown <>,
	Greg Kroah-Hartman <>
Subject: [PATCH 2/3] Driver core: Revert "Fix Firmware class name collision"
Date: Thu,  7 Feb 2008 12:02:18 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

From: Michael E Brown <>

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 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 0295855..4a1b9bf 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,

  parent reply	other threads:[~2008-02-07 20:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-07 20:01 [GIT PATCH] driver core fixes against 2.6.24-git Greg KH
2008-02-07 20:02 ` [PATCH 1/3] Block: Fix whole_disk attribute bug Greg Kroah-Hartman
2008-02-07 20:02 ` Greg Kroah-Hartman [this message]
2008-02-07 20:02 ` [PATCH 3/3] sysfs: remove BUG_ON() from sysfs_remove_group() Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \
    --subject='Re: [PATCH 2/3] Driver core: Revert "Fix Firmware class name collision"' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).