[NETNS]: Consolidate kernel netlink socket destruction.

[deliverable/linux.git] / drivers / connector / connector.c

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 37976dcf044b0ea96b2f6e731e4221a9d0a8e664..fea2d3ed9cbdacd57661f5a1a5227a1bde2ffeb2 100644 (file)
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -420,8 +420,7 @@ static int __devinit cn_init(void)
 
        dev->cbdev = cn_queue_alloc_dev("cqueue", dev->nls);
        if (!dev->cbdev) {
-               if (dev->nls->sk_socket)
-                       sock_release(dev->nls->sk_socket);
+               netlink_kernel_release(dev->nls);
                return -EINVAL;
        }
        
@@ -431,8 +430,7 @@ static int __devinit cn_init(void)
        if (err) {
                cn_already_initialized = 0;
                cn_queue_free_dev(dev->cbdev);
-               if (dev->nls->sk_socket)
-                       sock_release(dev->nls->sk_socket);
+               netlink_kernel_release(dev->nls);
                return -EINVAL;
        }
 
@@ -447,8 +445,7 @@ static void __devexit cn_fini(void)
 
        cn_del_callback(&dev->id);
        cn_queue_free_dev(dev->cbdev);
-       if (dev->nls->sk_socket)
-               sock_release(dev->nls->sk_socket);
+       netlink_kernel_release(dev->nls);
 }
 
 subsys_initcall(cn_init);