From: Alexander Usyskin Date: Sun, 25 Jan 2015 21:45:28 +0000 (+0200) Subject: mei: me: release hw from reset only during the reset flow X-Git-Tag: v3.16.35~2751 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4d1740859daedf8e1cf2bea495f9c7483863eca;p=thirdparty%2Fkernel%2Fstable.git mei: me: release hw from reset only during the reset flow commit 663b7ee9517eec6deea9a48c7a1392a9a34f7809 upstream. We might enter the interrupt handler with hw_ready already set, but prior we actually started the reset flow. To soleve this we move the reset release from the interrupt handler to the HW start wait function which is part of the reset sequence. Signed-off-by: Alexander Usyskin Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques --- diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 98bc7e05b97b8..5fcd1d69debc0 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -293,6 +293,7 @@ static int mei_me_hw_ready_wait(struct mei_device *dev) return err; } + mei_me_hw_reset_release(dev); dev->recvd_hw_ready = false; return 0; } @@ -672,7 +673,6 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id) /* check if we need to start the dev */ if (!mei_host_is_ready(dev)) { if (mei_hw_is_ready(dev)) { - mei_me_hw_reset_release(dev); dev_dbg(&dev->pdev->dev, "we need to start the dev.\n"); dev->recvd_hw_ready = true;