[PATCH v2] edac: remove dev_attr_sdram_scrub_rate on failure and destory path

[Junjie Mao]

v2: also remove the sysfs node in edac_remove_sysfs_mci_device

Signed-off-by: Junjie Mao <junjie.mao@xxxxxxxxxxx>
---
 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/