From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754146AbbFMTOb (ORCPT ); Sat, 13 Jun 2015 15:14:31 -0400 Received: from mga01.intel.com ([192.55.52.88]:8172 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751805AbbFMTNA (ORCPT ); Sat, 13 Jun 2015 15:13:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,608,1427785200"; d="scan'208";a="710414604" From: Tomas Winkler To: gregkh@linuxfoundation.org Cc: arnd@arndb.de, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [char-misc-next 08/17] mei: bus: report if event registration failed Date: Sat, 13 Jun 2015 22:11:40 +0300 Message-Id: <1434222709-10966-9-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434222709-10966-1-git-send-email-tomas.winkler@intel.com> References: <1434222709-10966-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 Signed-off-by: Tomas Winkler --- 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 9069d89b93d7..5bd16d4417bb 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -255,6 +255,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; @@ -263,7 +265,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.2