From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934030AbYBGUKy (ORCPT ); Thu, 7 Feb 2008 15:10:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932801AbYBGUEM (ORCPT ); Thu, 7 Feb 2008 15:04:12 -0500 Received: from ns.suse.de ([195.135.220.2]:37586 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932074AbYBGUEK (ORCPT ); Thu, 7 Feb 2008 15:04:10 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org 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 Message-Id: <1202414539-4672-2-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.5.4 In-Reply-To: <20080207200140.GA4572@suse.de> References: <20080207200140.GA4572@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, -- 1.5.4