Merge tag 'master-2014-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[firefly-linux-kernel-4.4.55.git] / security / selinux / netif.c

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index 3c3de4ca0ebcc81ff7759f4951cc8b5ff7108f01..50ce177d71a0561cdc0c0aaf4aabb13e4c7662ef 100644 (file)
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -272,7 +272,7 @@ static struct notifier_block sel_netif_netdev_notifier = {
 
 static __init int sel_netif_init(void)
 {
-       int i, err;
+       int i;
 
        if (!selinux_enabled)
                return 0;
@@ -282,7 +282,7 @@ static __init int sel_netif_init(void)
 
        register_netdevice_notifier(&sel_netif_netdev_notifier);
 
-       return err;
+       return 0;
 }
 
 __initcall(sel_netif_init);