Merge tag 'linux-kselftest-kunit-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kerne...

[linux.git] / drivers / edac / edac_mc.c

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 7243b88f81d889cd64b63d3ffc7991d05ab5e1a2..69e0d90460e6c4463046f29c76d1828d6dc3dde6 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -505,16 +505,10 @@ void edac_mc_free(struct mem_ctl_info *mci)
 {
        edac_dbg(1, "\n");
 
-       /* If we're not yet registered with sysfs free only what was allocated
-        * in edac_mc_alloc().
-        */
-       if (!device_is_registered(&mci->dev)) {
-               _edac_mc_free(mci);
-               return;
-       }
+       if (device_is_registered(&mci->dev))
+               edac_unregister_sysfs(mci);
 
-       /* the mci instance is freed here, when the sysfs object is dropped */
-       edac_unregister_sysfs(mci);
+       _edac_mc_free(mci);
 }
 EXPORT_SYMBOL_GPL(edac_mc_free);