git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
edac
/
edac_mc.c
diff --git
a/drivers/edac/edac_mc.c
b/drivers/edac/edac_mc.c
index
3630308
..
6b21e25
100644
(file)
--- 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;
{
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",
status = cancel_delayed_work(&mci->work);
if (status == 0) {
debugf0("%s() not canceled, flush the queue\n",