git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.14c-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
net
/
can
/
bcm.c
diff --git
a/net/can/bcm.c
b/net/can/bcm.c
index 47a8748d953afbf460238804d3d7d3d8b087f474..13690334efa31b978cff2ed6432af626f00cab76 100644
(file)
--- a/
net/can/bcm.c
+++ b/
net/can/bcm.c
@@
-1493,13
+1493,14
@@
static int bcm_init(struct sock *sk)
static int bcm_release(struct socket *sock)
{
struct sock *sk = sock->sk;
static int bcm_release(struct socket *sock)
{
struct sock *sk = sock->sk;
- struct net *net
= sock_net(sk)
;
+ struct net *net;
struct bcm_sock *bo;
struct bcm_op *op, *next;
struct bcm_sock *bo;
struct bcm_op *op, *next;
- if (
sk == NULL
)
+ if (
!sk
)
return 0;
return 0;
+ net = sock_net(sk);
bo = bcm_sk(sk);
/* remove bcm_ops, timer, rx_unregister(), etc. */
bo = bcm_sk(sk);
/* remove bcm_ops, timer, rx_unregister(), etc. */