From 2af007a08e30ad146e24bed7cc8af2d747b6d28a Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 27 Sep 2005 15:43:46 -0700
Subject: [PATCH] --- yaml --- r: 9438 b: refs/heads/master c:
 70ff3b66d79c5110e533f3f2aea1a5b2fc5f8d90 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/rose/af_rose.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 91dc66df5bb1..c02c7102ca27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3c4ed652e8f2c348ebdd3f2e45664a0e238ee52
+refs/heads/master: 70ff3b66d79c5110e533f3f2aea1a5b2fc5f8d90
diff --git a/trunk/net/rose/af_rose.c b/trunk/net/rose/af_rose.c
index a190eaee702e..dbfb0e3dc798 100644
--- a/trunk/net/rose/af_rose.c
+++ b/trunk/net/rose/af_rose.c
@@ -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 @@ static int __init rose_proto_init(void)
 	}
 	kfree(dev_rose);
 	proto_unregister(&rose_proto);
-	return -ENOMEM;
+	goto out;
 }
 module_init(rose_proto_init);