diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /net/socket.c | |
parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
parent | b377fd3982ad957c796758a90e2988401a884241 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index ec077037f534..7d44453dfae1 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -1168,7 +1168,7 @@ static int __sock_create(int family, int type, int protocol, | |||
1168 | module_put(pf->owner); | 1168 | module_put(pf->owner); |
1169 | err = security_socket_post_create(sock, family, type, protocol, kern); | 1169 | err = security_socket_post_create(sock, family, type, protocol, kern); |
1170 | if (err) | 1170 | if (err) |
1171 | goto out_release; | 1171 | goto out_sock_release; |
1172 | *res = sock; | 1172 | *res = sock; |
1173 | 1173 | ||
1174 | return 0; | 1174 | return 0; |