From: Tomas Winkler <tomas.winkler@intel.com>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc 3.11 3/4] mei: don't have to clean the state on power up
Date: Wed, 17 Jul 2013 15:13:16 +0300 [thread overview]
Message-ID: <1374063197-26855-4-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1374063197-26855-1-git-send-email-tomas.winkler@intel.com>
When powering up, we don't have to clean up the device state
nothing is connected.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/init.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index ed1d752..e6f16f8 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -148,7 +148,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
dev->hbm_state = MEI_HBM_IDLE;
- if (dev->dev_state != MEI_DEV_INITIALIZING) {
+ if (dev->dev_state != MEI_DEV_INITIALIZING &&
+ dev->dev_state != MEI_DEV_POWER_UP) {
if (dev->dev_state != MEI_DEV_DISABLED &&
dev->dev_state != MEI_DEV_POWER_DOWN)
dev->dev_state = MEI_DEV_RESETTING;
--
1.8.1.2
next prev parent reply other threads:[~2013-07-17 12:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 12:13 [char-misc 0/4 3.11] Fix mei suspend/resume failure Tomas Winkler
2013-07-17 12:13 ` [char-misc 3.11 1/4] mei: hbm: fix typo in error message Tomas Winkler
2013-07-17 12:13 ` [char-misc 3.11 2/4] mei: me: fix reset state machine Tomas Winkler
2013-07-17 12:13 ` Tomas Winkler [this message]
2013-07-17 12:13 ` [char-misc 3.11 4/4] mei: me: fix waiting for hw ready Tomas Winkler
2013-07-18 12:41 ` [char-misc 0/4 3.11] Fix mei suspend/resume failure Winkler, Tomas
2013-07-22 21:35 ` Winkler, Tomas
2013-07-22 22:24 ` Shuah Khan
2013-07-23 1:17 ` Shuah Khan
2013-07-24 19:59 ` Konstantin Khlebnikov
2013-07-24 20:08 ` Winkler, Tomas
2013-07-24 20:36 ` Konstantin Khlebnikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374063197-26855-4-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®