Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 19112712daf0..c79e0ad4ba02 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -198,18 +198,12 @@ err_exit:
 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
 }