From 8075c60ba0f2da4dbe27672b9e6830398c977f36 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <juhl-lkml@dif.dk>
Date: Thu, 23 Jun 2005 21:06:56 -0700
Subject: [PATCH] --- yaml --- r: 3167 b: refs/heads/master c:
 9b200b02a6c9cddca5132d64aa41156bbcddcbaa h: refs/heads/master i:   3165:
 3da10a4d22d2ce0019a5195f6e0eb01dc8bc3139   3163:
 acffebc5b9be6d44bde8834947d74fd3c2385e3f   3159:
 b3e80610c33f6d0a2e0fe3e0c0ea232753ef6639   3151:
 c74d99869eadb8e9797977bfd3e222a9f9a82767   3135:
 92b0b655fd835ee9ec24aab757d9a6910e89c3b7 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/slip.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a560f92699e9..fef84435497b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d675c989ed2d4ba23dff615330b04371aea83534
+refs/heads/master: 9b200b02a6c9cddca5132d64aa41156bbcddcbaa
diff --git a/trunk/drivers/net/slip.c b/trunk/drivers/net/slip.c
index 19112712daf0..c79e0ad4ba02 100644
--- a/trunk/drivers/net/slip.c
+++ b/trunk/drivers/net/slip.c
@@ -198,18 +198,12 @@ sl_alloc_bufs(struct slip *sl, int mtu)
 static void
 sl_free_bufs(struct slip *sl)
 {
-	void * tmp;
-
 	/* Free all SLIP frame buffers. */
-	tmp = xchg(&sl->rbuff, NULL);
-	kfree(tmp);
-	tmp = xchg(&sl->xbuff, NULL);
-	kfree(tmp);
+	kfree(xchg(&sl->rbuff, NULL));
+	kfree(xchg(&sl->xbuff, NULL));
 #ifdef SL_INCLUDE_CSLIP
-	tmp = xchg(&sl->cbuff, NULL);
-	kfree(tmp);
-	if ((tmp = xchg(&sl->slcomp, NULL)) != NULL)
-		slhc_free(tmp);
+	kfree(xchg(&sl->cbuff, NULL));
+	slhc_free(xchg(&sl->slcomp, NULL));
 #endif
 }