Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760388AbYBZI3S (ORCPT ); Tue, 26 Feb 2008 03:29:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751080AbYBZI3F (ORCPT ); Tue, 26 Feb 2008 03:29:05 -0500 Received: from www.tglx.de ([62.245.132.106]:60591 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbYBZI3E (ORCPT ); Tue, 26 Feb 2008 03:29:04 -0500 Date: Tue, 26 Feb 2008 09:28:13 +0100 (CET) From: Thomas Gleixner To: Quel Qun cc: David Woodhouse , Dave Young , Marcel Holtmann , LKML , Jiri Kosina , Ingo Molnar Subject: [PATCH] bluetooth: delete timer in l2cap_conn_del() In-Reply-To: <022620080003.1247.47C35750000085C8000004DF2207300793CE05040A05@comcast.net> Message-ID: References: <022620080003.1247.47C35750000085C8000004DF2207300793CE05040A05@comcast.net> User-Agent: Alpine 1.00 (LFD 882 2007-12-20) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 884 Lines: 29 Delete a possibly armed timer before kfree'ing the connection object. Solves: http://lkml.org/lkml/2008/2/15/514 Reported-by:Quel Qun Signed-off-by: Thomas Gleixner --- net/bluetooth/l2cap.c | 2 ++ 1 file changed, 2 insertions(+) Index: linux-2.6/net/bluetooth/l2cap.c =================================================================== --- linux-2.6.orig/net/bluetooth/l2cap.c +++ linux-2.6/net/bluetooth/l2cap.c @@ -417,6 +417,8 @@ static void l2cap_conn_del(struct hci_co l2cap_sock_kill(sk); } + del_timer_sync(&conn->info_timer); + hcon->l2cap_data = NULL; kfree(conn); } -- 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/