diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-19 09:21:33 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-19 09:21:33 +0200 |
commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /net/irda | |
parent | net: qlge: convert to hw_features (diff) | |
parent | ip6_pol_route panic: Do not allow VLAN on loopback (diff) | |
download | linux-e1943424e43974f85b82bb31eaf832823bf49ce7.tar.xz linux-e1943424e43974f85b82bb31eaf832823bf49ce7.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/af_irda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index c9890e25cd4c..cc616974a447 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1297,8 +1297,7 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock, /* Note : socket.c set MSG_EOR on SEQPACKET sockets */ if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_EOR | MSG_CMSG_COMPAT | MSG_NOSIGNAL)) { - err = -EINVAL; - goto out; + return -EINVAL; } lock_sock(sk); |