From e8f6da951c1223f7197738c159c503460175ef88 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Mon, 6 Aug 2012 07:51:16 +0000
Subject: [PATCH] --- yaml --- r: 321497 b: refs/heads/master c:
 b5497eeb37d7d4a5a61b91f64efedc90d1ad6fa3 h: refs/heads/master i:   321495:
 e463cf937ecfa5105199ea1efca77ab8269fcdc6 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/appletalk/cops.c | 4 +---
 trunk/drivers/net/appletalk/ltpc.c | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ad982aea4ff9..ef5e3b88f03d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47fd92f5a76eb3f5b407773766e7d7fa1a179419
+refs/heads/master: b5497eeb37d7d4a5a61b91f64efedc90d1ad6fa3
diff --git a/trunk/drivers/net/appletalk/cops.c b/trunk/drivers/net/appletalk/cops.c
index 545c09ed9079..cff6f023c03a 100644
--- a/trunk/drivers/net/appletalk/cops.c
+++ b/trunk/drivers/net/appletalk/cops.c
@@ -996,9 +996,7 @@ static int __init cops_module_init(void)
 		printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
 			cardname);
 	cops_dev = cops_probe(-1);
-	if (IS_ERR(cops_dev))
-		return PTR_ERR(cops_dev);
-        return 0;
+	return PTR_RET(cops_dev);
 }
 
 static void __exit cops_module_exit(void)
diff --git a/trunk/drivers/net/appletalk/ltpc.c b/trunk/drivers/net/appletalk/ltpc.c
index 0910dce3996d..b5782cdf0bca 100644
--- a/trunk/drivers/net/appletalk/ltpc.c
+++ b/trunk/drivers/net/appletalk/ltpc.c
@@ -1243,9 +1243,7 @@ static int __init ltpc_module_init(void)
 		       "ltpc: Autoprobing is not recommended for modules\n");
 
 	dev_ltpc = ltpc_probe();
-	if (IS_ERR(dev_ltpc))
-		return PTR_ERR(dev_ltpc);
-	return 0;
+	return PTR_RET(dev_ltpc);
 }
 module_init(ltpc_module_init);
 #endif