Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090Ab2FLUHj (ORCPT ); Tue, 12 Jun 2012 16:07:39 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:34230 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753644Ab2FLUHg (ORCPT ); Tue, 12 Jun 2012 16:07:36 -0400 From: Sasha Levin To: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com, linville@tuxdriver.com Cc: davej@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH] NFC: only put local on destruction if it was created before Date: Tue, 12 Jun 2012 22:08:19 +0200 Message-Id: <1339531699-7377-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 950 Lines: 31 Not having 'local' is a valid case when a socket was created but never bound or connected to anything, so avoid putting 'local' if it was never created. Signed-off-by: Sasha Levin --- net/nfc/llcp/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 2c0b317..54daa10 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c @@ -710,7 +710,8 @@ void nfc_llcp_sock_free(struct nfc_llcp_sock *sock) sock->parent = NULL; - nfc_llcp_local_put(sock->local); + if (sock->local) + nfc_llcp_local_put(sock->local); } static int llcp_sock_create(struct net *net, struct socket *sock, -- 1.7.8.6 -- 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/