releases/2.6.24.1/driver-core-revert-fix-firmware-class-name-collision.patch

   1 From michael_e_brown@humbolt.us.dell.com Tue Jan 29 13:34:58 2008
   2 From: Michael E Brown <Michael_E_Brown@dell.com>
   3 Date: Tue, 29 Jan 2008 15:35:01 -0600
   4 Subject: Driver core: Revert "Fix Firmware class name collision"
   5 To: Greg KH <gregkh@suse.de>
   6 Message-ID: <20080129213500.GA18423@humbolt.us.dell.com>
   7 Content-Disposition: inline
   8
   9 From: Michael E Brown <Michael_E_Brown@dell.com>
  10
  11 patch 7d640c4a5b36c4733460065db1554da924044511 in mainline.
  12
  13 This reverts commit 109f0e93b6b728f03c1eb4af02bc25d71b646c59.
  14
  15 The original patch breaks BIOS updates on all Dell machines. The path to
  16 the firmware file for the dell_rbu driver changes, which breaks all of
  17 the userspace tools which rely on it.
  18
  19 Note that this patch re-introduces a problem with i2c name collision
  20 that was previously fixed by this patch.
  21
  22 Signed-off-by: Michael E Brown <michael_e_brown@dell.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24
  25
  26 ---
  27  drivers/base/firmware_class.c |    3 ++-
  28  1 file changed, 2 insertions(+), 1 deletion(-)
  29
  30 --- a/drivers/base/firmware_class.c
  31 +++ b/drivers/base/firmware_class.c
  32 @@ -292,7 +292,8 @@ firmware_class_timeout(u_long data)
  33
  34  static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
  35  {
  36 -       snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
  37 +       /* XXX warning we should watch out for name collisions */
  38 +       strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
  39  }
  40
  41  static int fw_register_device(struct device **dev_p, const char *fw_name,