From f7da95ed38e2aef758f4e60b3d9b4d6a476230a8 Mon Sep 17 00:00:00 2001
From: Matvejchikov Ilya <matvejchikov@gmail.com>
Date: Tue, 12 Jul 2011 21:47:38 +0000
Subject: [PATCH] --- yaml --- r: 256272 b: refs/heads/master c:
 390fd0b388e4f85549e5d60bdeb21364b344d9b9 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/slip.c | 24 ++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 64b7bc61fbc7..918fb30c5749 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9173a88f46bf53e2fa85337563b39e13c43c7f2e
+refs/heads/master: 390fd0b388e4f85549e5d60bdeb21364b344d9b9
diff --git a/trunk/drivers/net/slip.c b/trunk/drivers/net/slip.c
index 6f97c5983c55..11c9ab3b1e1c 100644
--- a/trunk/drivers/net/slip.c
+++ b/trunk/drivers/net/slip.c
@@ -723,6 +723,7 @@ static void sl_sync(void)
 static struct slip *sl_alloc(dev_t line)
 {
 	int i;
+	char name[IFNAMSIZ];
 	struct net_device *dev = NULL;
 	struct slip       *sl;
 
@@ -735,25 +736,12 @@ static struct slip *sl_alloc(dev_t line)
 	if (i >= slip_maxdev)
 		return NULL;
 
-	if (dev) {
-		sl = netdev_priv(dev);
-		if (test_bit(SLF_INUSE, &sl->flags)) {
-			unregister_netdevice(dev);
-			dev = NULL;
-			slip_devs[i] = NULL;
-		}
-	}
-
-	if (!dev) {
-		char name[IFNAMSIZ];
-		sprintf(name, "sl%d", i);
-
-		dev = alloc_netdev(sizeof(*sl), name, sl_setup);
-		if (!dev)
-			return NULL;
-		dev->base_addr  = i;
-	}
+	sprintf(name, "sl%d", i);
+	dev = alloc_netdev(sizeof(*sl), name, sl_setup);
+	if (!dev)
+		return NULL;
 
+	dev->base_addr  = i;
 	sl = netdev_priv(dev);
 
 	/* Initialize channel control data */