diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-29 13:44:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-29 13:44:48 -0700 |
| commit | c23c2234de418d32f5b1cd1b7f2d22a13fd8e7fa (patch) | |
| tree | 405661c43c66e59b1c76efe3037122185d9a6ba9 /drivers/misc/mei/init.c | |
| parent | cac6653529eeac9b661fc8342c47d849c3adb085 (diff) | |
| parent | 8bbf9f440f196ee08cc5ab1c19e62b1c5a736ff0 (diff) | |
| download | linux-c23c2234de418d32f5b1cd1b7f2d22a13fd8e7fa.tar.gz linux-c23c2234de418d32f5b1cd1b7f2d22a13fd8e7fa.tar.bz2 linux-c23c2234de418d32f5b1cd1b7f2d22a13fd8e7fa.zip | |
Merge tag 'char-misc-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are some HyperV and MEI driver fixes for 3.12-rc3. They resolve
some issues that people have been reporting for them"
* tag 'char-misc-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Drivers: hv: vmbus: Terminate vmbus version negotiation on timeout
Drivers: hv: util: Correctly support ws2008R2 and earlier
mei: cancel stall timers in mei_reset
mei: bus: stop wait for read during cl state transition
mei: make me client counters less error prone
Diffstat (limited to 'drivers/misc/mei/init.c')
| -rw-r--r-- | drivers/misc/mei/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 92c73118b13c..6197018e2f16 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -175,6 +175,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; |