diff mbox

[Trusty,2/2] UBUNTU: Fix "mei: me: release hw from reset only during the reset flow"

Message ID 1430764682-7040-3-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa May 4, 2015, 6:38 p.m. UTC
This fixes commit fa9003594c74a82fea655f646c29f95a3f8eec42.

The original backport from 3.13-stable to ubuntu-trusty
accidentally missed this bit because a previous stable patch
("mei: me: fix hw ready reset flow") hadn't been applied.

BugLink: http://bugs.launchpad.net/bugs/1450813
Reported-and-tested-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/misc/mei/hw-me.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index cffd72b..c578d5d 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -517,9 +517,7 @@  irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
 	/*  check if we need to start the dev */
 	if (!mei_host_is_ready(dev)) {
 		if (mei_hw_is_ready(dev)) {
-			mei_me_hw_reset_release(dev);
 			dev_dbg(&dev->pdev->dev, "we need to start the dev.\n");
-
 			dev->recvd_hw_ready = true;
 			wake_up_interruptible(&dev->wait_hw_ready);
 		} else {