From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754618AbbCSKK7 (ORCPT ); Thu, 19 Mar 2015 06:10:59 -0400 Received: from mga02.intel.com ([134.134.136.20]:27286 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbbCSKK6 (ORCPT ); Thu, 19 Mar 2015 06:10:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,428,1422950400"; d="scan'208";a="700958505" From: Tomas Winkler To: gregkh@linuxfoundation.org Cc: arnd@arndb.de, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc] mei: fix regression on NFC connection Date: Thu, 19 Mar 2015 12:10:09 +0200 Message-Id: <1426759809-27755-1-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In mei_host_client_init function we enable the all internal connected clients including NFC. This is done before we set the device to enabled state and let userspace call open. We need to check only for MEI_FILE_CONNECTED in mei_cl_is_connected in order to enable the communication with the clients before MEI_DEV_ENABLED is set. Signed-off-by: Tomas Winkler --- drivers/misc/mei/client.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h index eb02f34b2fe0..7800d1bd8ba1 100644 --- a/drivers/misc/mei/client.h +++ b/drivers/misc/mei/client.h @@ -92,9 +92,7 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl); */ static inline bool mei_cl_is_connected(struct mei_cl *cl) { - return cl->dev && - cl->dev->dev_state == MEI_DEV_ENABLED && - cl->state == MEI_FILE_CONNECTED; + return cl->state == MEI_FILE_CONNECTED; } static inline bool mei_cl_is_transitioning(struct mei_cl *cl) { -- 1.9.3