[ROSE]: return sane -E* from rose_proto_init()
Alexey Dobriyan [Tue, 27 Sep 2005 22:43:46 +0000 (15:43 -0700)]
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/rose/af_rose.c

index a190eae..dbfb0e3 100644 (file)
@@ -1482,14 +1482,14 @@ static int __init rose_proto_init(void)
        if (rose_ndevs > 0x7FFFFFFF/sizeof(struct net_device *)) {
                printk(KERN_ERR "ROSE: rose_proto_init - rose_ndevs parameter to large\n");
                proto_unregister(&rose_proto);
-               return -1;
+               return -EINVAL;
        }
 
        dev_rose = kmalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL);
        if (dev_rose == NULL) {
                printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n");
                proto_unregister(&rose_proto);
-               return -1;
+               return -ENOMEM;
        }
 
        memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device*));
@@ -1502,9 +1502,11 @@ static int __init rose_proto_init(void)
                                   name, rose_setup);
                if (!dev) {
                        printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n");
+                       rc = -ENOMEM;
                        goto fail;
                }
-               if (register_netdev(dev)) {
+               rc = register_netdev(dev);
+               if (rc) {
                        printk(KERN_ERR "ROSE: netdevice regeistration failed\n");
                        free_netdev(dev);
                        goto fail;
@@ -1539,7 +1541,7 @@ fail:
        }
        kfree(dev_rose);
        proto_unregister(&rose_proto);
-       return -ENOMEM;
+       goto out;
 }
 module_init(rose_proto_init);