revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / edac / edac_mc.c

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 6d2e34d0f52a8c25b2567191974c2ce28e6ec470..6b21e25f7a84cc99ad6ea710b788745992d1170f 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -578,16 +578,14 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev)
                return NULL;
        }
 
+       /* marking MCI offline */
+       mci->op_state = OP_OFFLINE;
+
        del_mc_from_global_list(mci);
        mutex_unlock(&mem_ctls_mutex);
 
-       /* flush workq processes */
+       /* flush workq processes and remove sysfs */
        edac_mc_workq_teardown(mci);
-
-       /* marking MCI offline */
-       mci->op_state = OP_OFFLINE;
-
-       /* remove from sysfs */
        edac_remove_sysfs_mci_device(mci);
 
        edac_printk(KERN_INFO, EDAC_MC,