Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

[cascardo/linux.git] / net / l2tp / l2tp_netlink.c

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 4c1e540..93a41a0 100644 (file)
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -795,11 +795,12 @@ int l2tp_nl_register_ops(enum l2tp_pwtype pw_type, const struct l2tp_nl_cmd_ops
                goto out;
 
        l2tp_nl_cmd_ops[pw_type] = ops;
+       ret = 0;
 
 out:
        genl_unlock();
 err:
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL_GPL(l2tp_nl_register_ops);