diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-05-12 13:19:40 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-20 19:34:17 +0400 |
| commit | cd07b1ac0cc3d6e2704575ea62884e886e6cefa1 (patch) | |
| tree | ec4af5434e97bfaffc90a91f4ea4905227bd5093 /drivers/misc | |
| parent | 6004b0e5ac2e8e9e1bb0f012dc9242e03cca95df (diff) | |
| download | linux-cd07b1ac0cc3d6e2704575ea62884e886e6cefa1.tar.xz | |
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: Jiri Slaby <jslaby@suse.cz>
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 3412adcdaeb0..6cba26d9465f 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -183,6 +183,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 (dev->dev_state == MEI_DEV_POWER_DOWN) @@ -233,10 +234,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, |