aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/gen_tcp.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-11-09 08:37:30 +0100
committerRaimo Niskanen <[email protected]>2016-11-09 08:37:30 +0100
commit99bb976389c8971b755f103a67143815a6b3e388 (patch)
tree9c05ea209152e107de7065ac32ee2ab700413aba /lib/kernel/src/gen_tcp.erl
parent89822dcdd805c9a7bfd68349901d594ee64f7605 (diff)
parent992c594106ca23cd4120249cd904f6ffa7bdd13e (diff)
downloadotp-99bb976389c8971b755f103a67143815a6b3e388.tar.gz
otp-99bb976389c8971b755f103a67143815a6b3e388.tar.bz2
otp-99bb976389c8971b755f103a67143815a6b3e388.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
-rw-r--r--lib/kernel/src/gen_tcp.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 1a21541b7c..ac61dbc792 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -320,7 +320,7 @@ unrecv(S, Data) when is_port(S) ->
-spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
Socket :: socket(),
Pid :: pid(),
- Reason :: closed | not_owner | inet:posix().
+ Reason :: closed | not_owner | badarg | inet:posix().
controlling_process(S, NewOwner) ->
case inet_db:lookup_socket(S) of