From b96311a3589060d5c3bc24f9fedc968acf998309 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 24 Nov 2011 23:09:00 +0000
Subject: [PATCH] --- yaml --- r: 278259 b: refs/heads/master c:
 10cae1c8dfbbdee55bdfcb7034f4c2c1197dc0a4 h: refs/heads/master i:   278257:
 99aa64c36de226e5dec58a67d183e2548151b968   278255:
 fb0f4ccef75d456c055c87c1e6e0a3e55956421a v: v3

---
 [refs]                      | 2 +-
 trunk/net/netrom/nr_route.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 79d675baae43..0f664b8c1869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1a1de31515d950f858ba47d2bba74ff9a2614d
+refs/heads/master: 10cae1c8dfbbdee55bdfcb7034f4c2c1197dc0a4
diff --git a/trunk/net/netrom/nr_route.c b/trunk/net/netrom/nr_route.c
index 8d7716ca5342..2cf330162d7e 100644
--- a/trunk/net/netrom/nr_route.c
+++ b/trunk/net/netrom/nr_route.c
@@ -670,12 +670,10 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
 	case SIOCADDRT:
 		if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct)))
 			return -EFAULT;
-		if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)
+		if (nr_route.ndigis > AX25_MAX_DIGIS)
 			return -EINVAL;
-		if (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) {
-			dev_put(dev);
+		if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)
 			return -EINVAL;
-		}
 		switch (nr_route.type) {
 		case NETROM_NODE:
 			if (strnlen(nr_route.mnemonic, 7) == 7) {