Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Fix driver module removal
mariux64 · Sep 27, 2010 · befd1c7 · befd1c7
2 parents a11377e + 00740c5
commit befd1c7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
@@ -339,6 +339,9 @@ static void edac_mc_workq_teardown(struct mem_ctl_info *mci)
 {
 	int status;
 
+	if (mci->op_state != OP_RUNNING_POLL)
+		return;
+
 	status = cancel_delayed_work(&mci->work);
 	if (status == 0) {
 		debugf0("%s() not canceled, flush the queue\n",