diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-05-12 12:19:40 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-16 13:40:33 -0700 |
| commit | b6ac0f888ae9b06b3d4092b8252d493b059d1ded (patch) | |
| tree | 504e4eedb6ae0dbc7b4949f17ccbc93621a000fa | |
| parent | 7247670d5fb03e33ddd732aec69159b8d09c11c1 (diff) | |
| download | linux-stable-b6ac0f888ae9b06b3d4092b8252d493b059d1ded.tar.gz linux-stable-b6ac0f888ae9b06b3d4092b8252d493b059d1ded.tar.bz2 linux-stable-b6ac0f888ae9b06b3d4092b8252d493b059d1ded.zip | |
mei: me: drop harmful wait optimization
commit 07cd7be3d92eeeae1f92a017f2cfe4fdd9256526 upstream.
It my take time till ME_RDY will be cleared after the reset,
so we cannot check the bit before we got the interrupt
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>
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index d4e72fcc0ee8..f67c37ecf16d 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -186,6 +186,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) @@ -237,10 +238,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, |