projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for...
[cascardo/linux.git]
/
net
/
sctp
/
socket.c
diff --git
a/net/sctp/socket.c
b/net/sctp/socket.c
index
17bef01
..
897c01c
100644
(file)
--- a/
net/sctp/socket.c
+++ b/
net/sctp/socket.c
@@
-4475,7
+4475,7
@@
static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
}
newfile = sock_alloc_file(newsock, 0, NULL);
- if (
unlikely(IS_ERR(newfile)
)) {
+ if (
IS_ERR(newfile
)) {
put_unused_fd(retval);
sock_release(newsock);
return PTR_ERR(newfile);