From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbbGWMMA (ORCPT ); Thu, 23 Jul 2015 08:12:00 -0400 Received: from mga03.intel.com ([134.134.136.65]:16411 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752542AbbGWMJr (ORCPT ); Thu, 23 Jul 2015 08:09:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,530,1432623600"; d="scan'208";a="611456728" From: Tomas Winkler To: Greg Kroah-Hartman Cc: arnd@arndb.de, Alexander Usyskin , linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc-next 06/15 V3] mei: bus: report if event registration failed Date: Thu, 23 Jul 2015 15:08:38 +0300 Message-Id: <1437653327-3308-7-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437653327-3308-1-git-send-email-tomas.winkler@intel.com> References: <1437653327-3308-1-git-send-email-tomas.winkler@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If event registeration has failed, the caller should know about it. Signed-off-by: Tomas Winkler --- V2: fix the commit message V3: rebase drivers/misc/mei/bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index 257e200b5343..aba7688d1ddd 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -256,6 +256,8 @@ void mei_cl_bus_rx_event(struct mei_cl *cl) int mei_cl_register_event_cb(struct mei_cl_device *cldev, mei_cl_event_cb_t event_cb, void *context) { + int ret; + if (cldev->event_cb) return -EALREADY; @@ -264,7 +266,9 @@ int mei_cl_register_event_cb(struct mei_cl_device *cldev, cldev->event_context = context; INIT_WORK(&cldev->event_work, mei_bus_event_work); - mei_cl_read_start(cldev->cl, 0, NULL); + ret = mei_cl_read_start(cldev->cl, 0, NULL); + if (ret && ret != -EBUSY) + return ret; return 0; } -- 2.4.3