diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-06 21:33:19 -0500 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-06 21:33:19 -0500 | 
| commit | c63d352f053a788281eb90df0a71cd3a6b2c4040 (patch) | |
| tree | ce0c6f0993100d3d8feda1d9d487dfba4abc5bd0 /net/caif | |
| parent | 862b3d2090ae3d8b10bb4ee9275fd932bc4d0d44 (diff) | |
| parent | bc3913a5378cd0ddefd1dfec6917cc12eb23a946 (diff) | |
| download | linux-c63d352f053a788281eb90df0a71cd3a6b2c4040.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/caif')
| -rw-r--r-- | net/caif/caif_socket.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index aa209b1066c9..92cbbd2afddb 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1107,10 +1107,7 @@ static struct net_proto_family caif_family_ops = {  static int __init caif_sktinit_module(void)  { -	int err = sock_register(&caif_family_ops); -	if (!err) -		return err; -	return 0; +	return sock_register(&caif_family_ops);  }  static void __exit caif_sktexit_module(void)  |