diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-05-12 05:19:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 17:15:25 -0400 |
| commit | 07cd7be3d92eeeae1f92a017f2cfe4fdd9256526 (patch) | |
| tree | bb7571a39a1c3e28a61796cbbc95e297fca396a4 | |
| parent | b04ada92ffaabb868497a1fce8e4f6bf74e5488f (diff) | |
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>
| -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 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) | |||
| 203 | else | 203 | else |
| 204 | hcsr &= ~H_IE; | 204 | hcsr &= ~H_IE; |
| 205 | 205 | ||
| 206 | dev->recvd_hw_ready = false; | ||
| 206 | mei_me_reg_write(hw, H_CSR, hcsr); | 207 | mei_me_reg_write(hw, H_CSR, hcsr); |
| 207 | 208 | ||
| 208 | if (intr_enable == false) | 209 | if (intr_enable == false) |
| @@ -254,10 +255,7 @@ static bool mei_me_hw_is_ready(struct mei_device *dev) | |||
| 254 | static int mei_me_hw_ready_wait(struct mei_device *dev) | 255 | static int mei_me_hw_ready_wait(struct mei_device *dev) |
| 255 | { | 256 | { |
| 256 | int err; | 257 | int err; |
| 257 | if (mei_me_hw_is_ready(dev)) | ||
| 258 | return 0; | ||
| 259 | 258 | ||
| 260 | dev->recvd_hw_ready = false; | ||
| 261 | mutex_unlock(&dev->device_lock); | 259 | mutex_unlock(&dev->device_lock); |
| 262 | err = wait_event_interruptible_timeout(dev->wait_hw_ready, | 260 | err = wait_event_interruptible_timeout(dev->wait_hw_ready, |
| 263 | dev->recvd_hw_ready, | 261 | dev->recvd_hw_ready, |
