aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp/sock.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-11-01 03:39:31 -0400
committerDavid S. Miller <davem@davemloft.net>2007-11-01 03:39:31 -0400
commit6257ff2177ff02d7f260a7a501876aa41cb9a9f6 (patch)
tree9d9f80ccf16f3d4ef062e896f62974c5496193ad /net/bluetooth/cmtp/sock.c
parent154adbc8469ff21fbf5c958446ee92dbaab01be1 (diff)
[NET]: Forget the zero_it argument of sk_alloc()
Finally, the zero_it argument can be completely removed from the callers and from the function prototype. Besides, fix the checkpatch.pl warnings about using the assignments inside if-s. This patch is rather big, and it is a part of the previous one. I splitted it wishing to make the patches more readable. Hope this particular split helped. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/cmtp/sock.c')
-rw-r--r--net/bluetooth/cmtp/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index cf700c20d11e..783edab12ce8 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -204,7 +204,7 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol)
204 if (sock->type != SOCK_RAW) 204 if (sock->type != SOCK_RAW)
205 return -ESOCKTNOSUPPORT; 205 return -ESOCKTNOSUPPORT;
206 206
207 sk = sk_alloc(net, PF_BLUETOOTH, GFP_ATOMIC, &cmtp_proto, 1); 207 sk = sk_alloc(net, PF_BLUETOOTH, GFP_ATOMIC, &cmtp_proto);
208 if (!sk) 208 if (!sk)
209 return -ENOMEM; 209 return -ENOMEM;
210 210