summaryrefslogtreecommitdiffstats
path: root/net/tipc/name_distr.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-03 14:30:35 +0200
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-03 14:30:35 +0200
commitedc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch)
treef375d28043dd4457428a841167dc93d760ba9a46 /net/tipc/name_distr.c
parentMove jffs2_fs_i.h and jffs2_fs_sb.h from include/linux/ to fs/jffs2/ (diff)
parent[NETFILTER] SCTP conntrack: fix infinite loop (diff)
downloadlinux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.tar.xz
linux-edc4ff7c08e9885c40e60c4fb39fa42cc91a0602.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/tipc/name_distr.c')
-rw-r--r--net/tipc/name_distr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 953307a9df1d..a3bbc891f959 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -229,8 +229,7 @@ static void node_is_down(struct publication *publ)
publ->node, publ->ref, publ->key);
assert(p == publ);
write_unlock_bh(&tipc_nametbl_lock);
- if (publ)
- kfree(publ);
+ kfree(publ);
}
/**