From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 16 Aug 2012 13:25:33 +0000 (+0300)
Subject: mei: fix device stall after wd is stopped
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9bb3a5897e22bf6af82bc451db9458b1d794f627;p=openwrt%2Fstaging%2Fblogic.git

mei: fix device stall after wd is stopped

After watchdog was disabled the driver would stall
due to wrong calculation of credits reduction

The cat&paste bug was introduced in the commit
7bdf72d3d8059a50214069ea4b87c2174645f40f
mei: introduce mei_data2slots wrapper

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 94370d26ed45..7d9a91298ec1 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -1253,7 +1253,7 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
 			if (dev->wd_timeout)
 				*slots -= mei_data2slots(MEI_START_WD_DATA_SIZE);
 			else
-				*slots -= mei_data2slots(MEI_START_WD_DATA_SIZE);
+				*slots -= mei_data2slots(MEI_WD_PARAMS_SIZE);
 		}
 	}
 	if (dev->stop)