From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 12 May 2014 09:19:40 +0000 (+0300)
Subject: mei: me: drop harmful wait optimization
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07cd7be3d92eeeae1f92a017f2cfe4fdd9256526;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git
mei: me: drop harmful wait optimization
It my take time till ME_RDY will be cleared after the reset,
so we cannot check the bit before we got the interrupt
Cc: stable@vger.kernel.org
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index ac76a6377794..031efcfed39e 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -203,6 +203,7 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
else
hcsr &= ~H_IE;
+ dev->recvd_hw_ready = false;
mei_me_reg_write(hw, H_CSR, hcsr);
if (intr_enable == false)
@@ -254,10 +255,7 @@ static bool mei_me_hw_is_ready(struct mei_device *dev)
static int mei_me_hw_ready_wait(struct mei_device *dev)
{
int err;
- if (mei_me_hw_is_ready(dev))
- return 0;
- dev->recvd_hw_ready = false;
mutex_unlock(&dev->device_lock);
err = wait_event_interruptible_timeout(dev->wait_hw_ready,
dev->recvd_hw_ready,