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:44:09 -0700 |
| commit | 4f104ed166d1039950a6fbebcffbde92543bd2eb (patch) | |
| tree | 3f8fa5cecb1af478db6fd5134c62994ea6903360 /drivers/misc | |
| parent | b1b94ac553e0ab8182d63e5b36f7633c4c3c20a7 (diff) | |
| download | lwn-4f104ed166d1039950a6fbebcffbde92543bd2eb.tar.gz lwn-4f104ed166d1039950a6fbebcffbde92543bd2eb.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>
Diffstat (limited to 'drivers/misc')
| -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 7950139c00f2..01a45e71f5a7 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, |