X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fedac%2Fedac_mc.c;h=6b21e25f7a84cc99ad6ea710b788745992d1170f;hb=f6f0a6d6a7258eff41fd202fc70df18271a2de79;hp=3630308e7b811a66f398193eae71cc12f5d7383f;hpb=adbfbcd12af3d183957622a99ca009b665639b81;p=pandora-kernel.git

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)
 {
 	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",