Merge tag 'davinci-v3.6-cleanup' of git://gitorious.org/linux-davinci/linux-davinci...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / can / af_can.c

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 9b0c32a2690c3f168eb78b5193b80fa12c72f53f..0ce2ad0696da81287b438ea1357320dd064d43e3 100644 (file)
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -38,8 +38,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #include <linux/module.h>
@@ -719,7 +717,7 @@ int can_proto_register(const struct can_proto *cp)
                       proto);
                err = -EBUSY;
        } else
-               rcu_assign_pointer(proto_tab[proto], cp);
+               RCU_INIT_POINTER(proto_tab[proto], cp);
 
        mutex_unlock(&proto_tab_lock);
 
@@ -740,7 +738,7 @@ void can_proto_unregister(const struct can_proto *cp)
 
        mutex_lock(&proto_tab_lock);
        BUG_ON(proto_tab[proto] != cp);
-       rcu_assign_pointer(proto_tab[proto], NULL);
+       RCU_INIT_POINTER(proto_tab[proto], NULL);
        mutex_unlock(&proto_tab_lock);
 
        synchronize_rcu();