Merge branch 'linus' into tracing/hw-branch-tracing

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 5fcd3d89c75d..4041e9143283 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -394,6 +394,12 @@ static void edac_device_workq_function(struct work_struct *work_req)
 
         mutex_lock(&device_ctls_mutex);
 
+        /* If we are being removed, bail out immediately */
+        if (edac_dev->op_state == OP_OFFLINE) {
+                mutex_unlock(&device_ctls_mutex);
+                return;
+        }
+
         /* Only poll controllers that are running polled and have a check */
         if ((edac_dev->op_state == OP_RUNNING_POLL) &&
                 (edac_dev->edac_check != NULL)) {
@@ -585,14 +591,14 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
         /* mark this instance as OFFLINE */
         edac_dev->op_state = OP_OFFLINE;
 
-        /* clear workq processing on this instance */
-        edac_device_workq_teardown(edac_dev);
-
         /* deregister from global list */
         del_edac_device_from_global_list(edac_dev);
 
         mutex_unlock(&device_ctls_mutex);
 
+        /* clear workq processing on this instance */
+        edac_device_workq_teardown(edac_dev);
+
         /* Tear down the sysfs entries for this instance */
         edac_device_remove_sysfs(edac_dev);