Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757558AbXIXCzD (ORCPT ); Sun, 23 Sep 2007 22:55:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755169AbXIXCyy (ORCPT ); Sun, 23 Sep 2007 22:54:54 -0400 Received: from wa-out-1112.google.com ([209.85.146.181]:58250 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754597AbXIXCyx (ORCPT ); Sun, 23 Sep 2007 22:54:53 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:date:from:to:cc:subject:message-id:reply-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=bNGwhtHqpVBUQmFL/Vd+bPl5+Cus88B58btR4Sv+XJPoke9GWaIEUJoChksClJisJp0pnBrlZKhKPkmPnFrHsuRSjrEmJHXB6A68/sRpmX1yXANmRkEF6l+RJYMwLufX6kgUPKC/Ubt5F7nQkX/4z1vgrHb+Gqg0jPTLNcfxgx8= Date: Mon, 24 Sep 2007 10:50:27 +0800 From: WANG Cong To: roel <12o3l@tiscali.nl> Cc: WANG Cong , Andrew Morton , linux-kernel@vger.kernel.org, marcel@holtmann.org, bluez-devel@lists.sourceforge.net, maxk@qualcomm.com Subject: [Resend][-mm Patch] net/bluetooth/hidp/core.c: Make hidp_setup_input() return int Message-ID: <20070924025027.GB2442@hacking> Reply-To: WANG Cong References: <20070918011841.2381bd93.akpm@linux-foundation.org> <20070923030105.GH2475@hacking> <46F6E502.9000101@tiscali.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46F6E502.9000101@tiscali.nl> User-Agent: Mutt/1.5.14 (2007-02-12) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1746 Lines: 55 This patch does the following things: - Make hidp_setup_input() return int to indicate errors. - Check its return value to handle errors. Thanks to roel for comments. Signed-off-by: WANG Cong --- net/bluetooth/hidp/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Index: linux-2.6.23-rc6-mm1/net/bluetooth/hidp/core.c =================================================================== --- linux-2.6.23-rc6-mm1.orig/net/bluetooth/hidp/core.c +++ linux-2.6.23-rc6-mm1/net/bluetooth/hidp/core.c @@ -625,7 +625,7 @@ static struct device *hidp_get_device(st return conn ? &conn->dev : NULL; } -static inline void hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req) +static inline int hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req) { struct input_dev *input = session->input; int i; @@ -669,7 +669,7 @@ static inline void hidp_setup_input(stru input->event = hidp_input_event; - input_register_device(input); + return input_register_device(input); } static int hidp_open(struct hid_device *hid) @@ -822,8 +822,11 @@ int hidp_add_connection(struct hidp_conn session->flags = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID); session->idle_to = req->idle_to; - if (session->input) - hidp_setup_input(session, req); + if (session->input) { + err = hidp_setup_input(session, req); + if (err) + goto failed; + } if (session->hid) hidp_setup_hid(session, req); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/