[char-misc-next] mei: remove check on pm_runtime_active in __mei_cl_disconnect

From: Tomas Winkler
Date: Tue Aug 04 2015 - 07:31:22 EST


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@xxxxxxxxx>
Signed-off-by: Alexander Usyskin <alexander.usyskin@xxxxxxxxx>
---
drivers/misc/mei/client.c | 3 ---
1 file changed, 3 deletions(-)

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);
--
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/