projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mei: cancel stall timers in mei_reset
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
misc
/
mei
/
init.c
diff --git
a/drivers/misc/mei/init.c
b/drivers/misc/mei/init.c
index 6eec689ba97ef71e95f1c27bd280d9c948bc50c8..878bc1c29d2b8d811715236ceafa9327385bf225 100644
(file)
--- a/
drivers/misc/mei/init.c
+++ b/
drivers/misc/mei/init.c
@@
-164,6
+164,9
@@
void mei_reset(struct mei_device *dev, int interrupts_enabled)
memset(&dev->wr_ext_msg, 0, sizeof(dev->wr_ext_msg));
}
+ /* we're already in reset, cancel the init timer */
+ dev->init_clients_timer = 0;
+
dev->me_clients_num = 0;
dev->rd_msg_hdr = 0;
dev->wd_pending = false;