Pull mem-attribute into release branch

[linux-2.6] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 601c37d61c037198ea4908b94bd394d976617f9a..848b8fa8bedd23ee09048ec87e096fc505b6fcb7 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -37,7 +37,9 @@ static int __init br_init(void)
                return -EADDRINUSE;
        }
 
-       br_fdb_init();
+       err = br_fdb_init();
+       if (err)
+               goto err_out1;
 
        err = br_netfilter_init();
        if (err)