diff --git a/[refs] b/[refs] index 274e301f0506..0bf0d83c5ab5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031 +refs/heads/master: 8a22c99a80b0926585cfcbcc423ee2c49c1fd820 diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c index d1444b95ad7e..9c5074528a71 100644 --- a/trunk/net/ipv6/mcast.c +++ b/trunk/net/ipv6/mcast.c @@ -257,7 +257,7 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net, return NULL; idev = __in6_dev_get(dev); if (!idev) - return NULL;; + return NULL; read_lock_bh(&idev->lock); if (idev->dead) { read_unlock_bh(&idev->lock);