From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755909AbbBDAtQ (ORCPT ); Tue, 3 Feb 2015 19:49:16 -0500 Received: from blu004-omc1s17.hotmail.com ([65.55.116.28]:63567 "EHLO BLU004-OMC1S17.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754307AbbBDAtP (ORCPT ); Tue, 3 Feb 2015 19:49:15 -0500 X-TMN: [YrL8NgLlozwsrjDa3oMNrm3Ke9Zi1K82] X-Originating-Email: [junjie.mao@hotmail.com] Message-ID: From: Junjie Mao To: Doug Thompson CC: Borislav Petkov , Mauro Carvalho Chehab , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Junjie Mao Subject: [PATCH v2] edac: remove dev_attr_sdram_scrub_rate on failure and destory path Date: Wed, 4 Feb 2015 08:49:01 +0800 X-Mailer: git-send-email 1.9.3 X-OriginalArrivalTime: 04 Feb 2015 00:49:13.0708 (UTC) FILETIME=[655112C0:01D04014] MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org v2: also remove the sysfs node in edac_remove_sysfs_mci_device Signed-off-by: Junjie Mao --- drivers/edac/edac_mc_sysfs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 8e48d32efe37..97eefc409cac 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -1068,6 +1068,8 @@ fail_unregister_dimm: continue; device_unregister(&dimm->dev); } + if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) + device_remove_file(&mci->dev, &dev_attr_sdram_scrub_rate); fail_unregister_dev: device_unregister(&mci->dev); fail_unregister_bus: @@ -1100,6 +1102,9 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci) edac_dbg(0, "removing device %s\n", dev_name(&dimm->dev)); device_unregister(&dimm->dev); } + + if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) + device_remove_file(&mci->dev, &dev_attr_sdram_scrub_rate); } void edac_unregister_sysfs(struct mem_ctl_info *mci) -- 1.9.3