diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2012-08-16 09:25:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-16 12:50:17 -0400 |
| commit | 9bb3a5897e22bf6af82bc451db9458b1d794f627 (patch) | |
| tree | ce926c08b019cba2ee65eadf3abe95fffab7d16d /drivers/misc | |
| parent | b210d7506f416e7250eb52c314e5ed08928639dd (diff) | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 1253 | if (dev->wd_timeout) | 1253 | if (dev->wd_timeout) |
| 1254 | *slots -= mei_data2slots(MEI_START_WD_DATA_SIZE); | 1254 | *slots -= mei_data2slots(MEI_START_WD_DATA_SIZE); |
| 1255 | else | 1255 | else |
| 1256 | *slots -= mei_data2slots(MEI_START_WD_DATA_SIZE); | 1256 | *slots -= mei_data2slots(MEI_WD_PARAMS_SIZE); |
| 1257 | } | 1257 | } |
| 1258 | } | 1258 | } |
| 1259 | if (dev->stop) | 1259 | if (dev->stop) |