summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-06-09 15:41:57 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-09 15:41:57 -0400
commitf6d4c7133257bb2d6f66723d11b19f1c49cdf2f7 (patch)
tree02e37b991d8ec35b970d17352ec683bfde10b85d /net
parentc7a61cba71fd151cc7d9ebe53a090e0e61eeebf3 (diff)
parent97edec3a11cf6f73f2e45c3035b5ff8e4c3543dd (diff)
downloadop-kernel-dev-f6d4c7133257bb2d6f66723d11b19f1c49cdf2f7.zip
op-kernel-dev-f6d4c7133257bb2d6f66723d11b19f1c49cdf2f7.tar.gz
Merge tag 'linux-can-fixes-for-4.12-20170609' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2017-06-09 this is a pull request of 6 patches for net/master. There's a patch by Stephane Grosjean that fixes an uninitialized symbol warning in the peak_canfd driver. A patch by Johan Hovold to fix the product-id endianness in an error message in the the peak_usb driver. A patch by Oliver Hartkopp to enable CAN FD for virtual CAN devices by default. Three patches by me, one makes the helper function can_change_state() robust to be called with cf == NULL. The next patch fixes a memory leak in the gs_usb driver. And the last one fixes a lockdep splat by properly initialize the per-net can_rcvlists_lock spin_lock. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index b6406fe..88edac0 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -872,8 +872,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
static int can_pernet_init(struct net *net)
{
- net->can.can_rcvlists_lock =
- __SPIN_LOCK_UNLOCKED(net->can.can_rcvlists_lock);
+ spin_lock_init(&net->can.can_rcvlists_lock);
net->can.can_rx_alldev_list =
kzalloc(sizeof(struct dev_rcv_lists), GFP_KERNEL);
OpenPOWER on IntegriCloud