diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /net/socket.c | |
parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 23898f45f713..0ce12dfc7a71 100644 --- a/net/socket.c +++ b/net/socket.c @@ -490,6 +490,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) struct file *file; struct socket *sock; + *err = -EBADF; file = fget_light(fd, fput_needed); if (file) { sock = sock_from_file(file, err); |