Commit 1ab1e79b authored Jan 25, 2015 by Alexander Usyskin Committed by Greg Kroah-Hartman Feb 03, 2015

mei: mask interrupt set bit on clean reset bit



We should mask interrupt set bit when writing back
hcsr value in reset bit clean-up.

This is refinement for
mei: clean reset bit before reset
commit b13a65ef

Cc: <stable@vger.kernel.org> #3.10+
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>

parent 786f9496

drivers/misc/mei/hw-me.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
		if ((hcsr & H_RST) == H_RST) {
		dev_warn(dev->dev, "H_RST is set = 0x%08X", hcsr);
		hcsr &= ~H_RST;
		mei_me_reg_write(hw, H_CSR, hcsr);
		mei_hcsr_set(hw, hcsr);
		hcsr = mei_hcsr_read(hw);
		}