Merge commit 'v2.6.30-rc5' into next

[karo-tx-linux.git] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 2785d66a7e38a1c94143a2fae07188545392f292..b8ab37ad7ed56f60978d3827c31d722654c74fe0 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -203,7 +203,7 @@ static int __init nfnetlink_init(void)
                                     nfnetlink_rcv, NULL, THIS_MODULE);
        if (!nfnl) {
                printk(KERN_ERR "cannot initialize nfnetlink!\n");
-               return -1;
+               return -ENOMEM;
        }
 
        return 0;