Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 13 insertions, 7 deletions

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 851cabb90bce..c14f0dc0157c 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -928,6 +928,8 @@ static int rx_queue_add_kobject(struct net_device *dev, int index)
         if (error)
                 return error;
 
+        dev_hold(queue->dev);
+
         if (dev->sysfs_rx_queue_group) {
                 error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group);
                 if (error) {
@@ -937,7 +939,6 @@ static int rx_queue_add_kobject(struct net_device *dev, int index)
         }
 
         kobject_uevent(kobj, KOBJ_ADD);
-        dev_hold(queue->dev);
 
         return error;
 }
@@ -1464,6 +1465,8 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
         if (error)
                 return error;
 
+        dev_hold(queue->dev);
+
 #ifdef CONFIG_BQL
         error = sysfs_create_group(kobj, &dql_group);
         if (error) {
@@ -1473,7 +1476,6 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
 #endif
 
         kobject_uevent(kobj, KOBJ_ADD);
-        dev_hold(queue->dev);
 
         return 0;
 }
@@ -1745,16 +1747,20 @@ int netdev_register_kobject(struct net_device *ndev)
 
         error = device_add(dev);
         if (error)
-                return error;
+                goto error_put_device;
 
         error = register_queue_kobjects(ndev);
-        if (error) {
-                device_del(dev);
-                return error;
-        }
+        if (error)
+                goto error_device_del;
 
         pm_runtime_set_memalloc_noio(dev, true);
 
+        return 0;
+
+error_device_del:
+        device_del(dev);
+error_put_device:
+        put_device(dev);
         return error;
 }