From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 4 Aug 2015 11:30:11 +0000 (+0300)
Subject: mei: remove check on pm_runtime_active in __mei_cl_disconnect
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eead035a35b59df9f956139cb2c73141751a246e;p=linux-beck.git

mei: remove check on pm_runtime_active in __mei_cl_disconnect

Remove bogus check on pm_runtime_active that prevented
disconnection from a client in case the device was resuming
from power gating but not yet active.

Fix regression introduced by
18901357e70ae29e3fd1c58712a6847c2ae52eae
mei: disconnect on connection request timeout

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>
---

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 5fcd70bcdf96..a6c87c713193 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -853,9 +853,6 @@ static int __mei_cl_disconnect(struct mei_cl *cl)
 
 	dev = cl->dev;
 
-	if (WARN_ON(!pm_runtime_active(dev->dev)))
-		return -EFAULT;
-
 	cl->state = MEI_FILE_DISCONNECTING;
 
 	cb = mei_io_cb_init(cl, MEI_FOP_DISCONNECT, NULL);