mei: cancel stall timers in mei_reset
authorAlexander Usyskin <alexander.usyskin@intel.com>
Mon, 2 Sep 2013 10:29:47 +0000 (13:29 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2013 14:13:10 +0000 (07:13 -0700)
commit51d4e0771c3c69bb021d3052433e49effa6e4f65
tree792ebadf4040778fc9f63f793cd12c428ebef1e1
parent18f48d9e784339c954eb1641fef600e00c7a53c0
mei: cancel stall timers in mei_reset

commit 4a704575cc1afb3b848f096778fa9b8d7b3d5813 upstream.

Unset init_clients_timer and amthif_stall_timers
in mei_reset in order to cancel timer ticking and hence
avoid recursive reset calls.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/amthif.c
drivers/misc/mei/init.c