Messages in this thread Patch in this message | | | From | Tomas Winkler <> | Subject | [char-misc-next 8/8] mei: print correct device state during unexpected reset | Date | Mon, 21 Oct 2013 22:05:43 +0300 |
| |
From: Alexander Usyskin <alexander.usyskin@intel.com>
Move the unexpected state print to the beginning of mei_reset, thus printing right state.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- drivers/misc/mei/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 4c93e3d..7dfc7a4 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -147,6 +147,10 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) dev->dev_state != MEI_DEV_POWER_DOWN && dev->dev_state != MEI_DEV_POWER_UP); + if (unexpected) + dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n", + mei_dev_state_str(dev->dev_state)); + ret = mei_hw_reset(dev, interrupts_enabled); if (ret) { dev_err(&dev->pdev->dev, "hw reset failed disabling the device\n"); @@ -186,10 +190,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) dev->rd_msg_hdr = 0; dev->wd_pending = false; - if (unexpected) - dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n", - mei_dev_state_str(dev->dev_state)); - if (!interrupts_enabled) { dev_dbg(&dev->pdev->dev, "intr not enabled end of reset\n"); return; -- 1.8.3.1
| |