diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-08-04 13:30:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-05 06:58:47 +0200 |
| commit | eead035a35b59df9f956139cb2c73141751a246e (patch) | |
| tree | 78dcb85a38f7245381b2d57eb5723208f4e8b559 /drivers/misc | |
| parent | mei: hbm: bump supported HBM version to 2.0 (diff) | |
| download | linux-eead035a35b59df9f956139cb2c73141751a246e.tar.xz linux-eead035a35b59df9f956139cb2c73141751a246e.zip | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/client.c | 3 |
1 files changed, 0 insertions, 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); |