[NET]: Call uninit if necessary in register_netdevice

[mirror_ubuntu-zesty-kernel.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 8c9518e946fa2edc911a9451f2f09db158be37b2..7bfea5e9030e1bf9d1b1612bb0cfdd7ced4dfbda 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3337,7 +3337,7 @@ int register_netdevice(struct net_device *dev)
 
        if (!dev_valid_name(dev->name)) {
                ret = -EINVAL;
-               goto out;
+               goto err_uninit;
        }
 
        dev->ifindex = dev_new_index();
@@ -3351,7 +3351,7 @@ int register_netdevice(struct net_device *dev)
                        = hlist_entry(p, struct net_device, name_hlist);
                if (!strncmp(d->name, dev->name, IFNAMSIZ)) {
                        ret = -EEXIST;
-                       goto out;
+                       goto err_uninit;
                }
        }
 
@@ -3411,7 +3411,7 @@ int register_netdevice(struct net_device *dev)
 
        ret = netdev_register_sysfs(dev);
        if (ret)
-               goto out;
+               goto err_uninit;
        dev->reg_state = NETREG_REGISTERED;
 
        /*
@@ -3436,6 +3436,11 @@ int register_netdevice(struct net_device *dev)
 
 out:
        return ret;
+
+err_uninit:
+       if (dev->uninit)
+               dev->uninit(dev);
+       goto out;
 }
 
 /**