diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 15:31:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 15:31:12 -0400 |
| commit | befd1c7aae617fe6ea3d78f77773d171a8413b15 (patch) | |
| tree | 0a2b90a0c7bde67caa376c9424f124858136acc6 /drivers | |
| parent | a11377e47cf3f0174ea97a699a8ae0929b179aef (diff) | |
| parent | 00740c58541b6087d78418cebca1fcb86dc6077d (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/edac_mc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 3630308e7b81..6b21e25f7a84 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) | |||
| 339 | { | 339 | { |
| 340 | int status; | 340 | int status; |
| 341 | 341 | ||
| 342 | if (mci->op_state != OP_RUNNING_POLL) | ||
| 343 | return; | ||
| 344 | |||
| 342 | status = cancel_delayed_work(&mci->work); | 345 | status = cancel_delayed_work(&mci->work); |
| 343 | if (status == 0) { | 346 | if (status == 0) { |
| 344 | debugf0("%s() not canceled, flush the queue\n", | 347 | debugf0("%s() not canceled, flush the queue\n", |