aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-10-22 15:24:35 +1000
committerDave Airlie <airlied@linux.ie>2005-10-22 15:24:35 +1000
commit23bfc1a339e98510f2ce25a2764a0cfe195faa9e (patch)
tree51652ad15f85d9d1367ae6f9b8641dfe46b4c501 /net/dccp/proto.c
parent312f5726055534be1dc9dd369be13aabd2943fcb (diff)
parent63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff)
downloadkernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.zip
kernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.tar.gz
kernel_samsung_smdk4412-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.tar.bz2
merge linus head to drm-mm branch
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index a1cfd0e..a021c34 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -402,8 +402,6 @@ int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
* This bug was _quickly_ found & fixed by just looking at an OSTRA
* generated callgraph 8) -acme
*/
- if (rc != 0)
- goto out_discard;
out_release:
release_sock(sk);
return rc ? : len;