summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-27 12:31:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-27 12:31:12 -0700
commitbefd1c7aae617fe6ea3d78f77773d171a8413b15 (patch)
tree0a2b90a0c7bde67caa376c9424f124858136acc6
parenta11377e47cf3f0174ea97a699a8ae0929b179aef (diff)
parent00740c58541b6087d78418cebca1fcb86dc6077d (diff)
downloadlinux-3.10-befd1c7aae617fe6ea3d78f77773d171a8413b15.tar.gz
linux-3.10-befd1c7aae617fe6ea3d78f77773d171a8413b15.tar.bz2
linux-3.10-befd1c7aae617fe6ea3d78f77773d171a8413b15.zip
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
-rw-r--r--drivers/edac/edac_mc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 3630308e7b8..6b21e25f7a8 100644
--- 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",