From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933432AbbHDLbT (ORCPT ); Tue, 4 Aug 2015 07:31:19 -0400 Received: from mga03.intel.com ([134.134.136.65]:54452 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932196AbbHDLbR (ORCPT ); Tue, 4 Aug 2015 07:31:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,608,1432623600"; d="scan'208";a="777463675" From: Tomas Winkler To: Greg Kroah-Hartman Cc: arnd@arndb.de, Alexander Usyskin , linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc-next] mei: remove check on pm_runtime_active in __mei_cl_disconnect Date: Tue, 4 Aug 2015 14:30:11 +0300 Message-Id: <1438687811-28064-1-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Alexander Usyskin --- 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