aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index c32d45209cc6..f7f3abbe12b6 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)
147 dev->dev_state != MEI_DEV_POWER_DOWN && 147 dev->dev_state != MEI_DEV_POWER_DOWN &&
148 dev->dev_state != MEI_DEV_POWER_UP); 148 dev->dev_state != MEI_DEV_POWER_UP);
149 149
150 if (unexpected)
151 dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n",
152 mei_dev_state_str(dev->dev_state));
153
150 ret = mei_hw_reset(dev, interrupts_enabled); 154 ret = mei_hw_reset(dev, interrupts_enabled);
151 if (ret) { 155 if (ret) {
152 dev_err(&dev->pdev->dev, "hw reset failed disabling the device\n"); 156 dev_err(&dev->pdev->dev, "hw reset failed disabling the device\n");
@@ -185,10 +189,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
185 dev->rd_msg_hdr = 0; 189 dev->rd_msg_hdr = 0;
186 dev->wd_pending = false; 190 dev->wd_pending = false;
187 191
188 if (unexpected)
189 dev_warn(&dev->pdev->dev, "unexpected reset: dev_state = %s\n",
190 mei_dev_state_str(dev->dev_state));
191
192 if (!interrupts_enabled) { 192 if (!interrupts_enabled) {
193 dev_dbg(&dev->pdev->dev, "intr not enabled end of reset\n"); 193 dev_dbg(&dev->pdev->dev, "intr not enabled end of reset\n");
194 return; 194 return;