Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a704575 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: cancel stall timers in mei_reset 



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

Cc:  <stable@vger.kernel.org> # 3.9+
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2b31644

drivers/misc/mei/amthif.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ void mei_amthif_reset_params(struct mei_device *dev) 
	dev->iamthif_ioctl = false;

	dev->iamthif_state = MEI_IAMTHIF_IDLE;

	dev->iamthif_timer = 0;

	dev->iamthif_stall_timer = 0;

}



/**

drivers/misc/mei/init.c

+3 −0
Original line number Diff line number Diff line
@@ -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;