Merge tag 'v3.12-rc4' into next

[karo-tx-linux.git] / drivers / net / ifb.c

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index a11f7a45cb5f28c355a535e6a7b543b5628905c1..a3bed28197d29bf9722b6c586f311827d357b501 100644 (file)
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -291,6 +291,8 @@ static int __init ifb_init_module(void)
 
        rtnl_lock();
        err = __rtnl_link_register(&ifb_link_ops);
+       if (err < 0)
+               goto out;
 
        for (i = 0; i < numifbs && !err; i++) {
                err = ifb_init_one(i);
@@ -298,6 +300,8 @@ static int __init ifb_init_module(void)
        }
        if (err)
                __rtnl_link_unregister(&ifb_link_ops);
+
+out:
        rtnl_unlock();
 
        return err;