From cacfb5e5fdae41908a67eee1e66cef96c3a059c2 Mon Sep 17 00:00:00 2001
From: Andre Haupt <andre@bitwigglers.org>
Date: Mon, 26 Jan 2009 16:12:21 +0100
Subject: [PATCH] --- yaml --- r: 141226 b: refs/heads/master c:
 e8aa1bd0987bd66ae2a44c05cdacf5cea83b6d62 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/me4000/me4000.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d7c73a1d2bcc..333ef8d86acb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 705d300e1bcb5e2724690b6deb89fbfc453d790e
+refs/heads/master: e8aa1bd0987bd66ae2a44c05cdacf5cea83b6d62
diff --git a/trunk/drivers/staging/me4000/me4000.c b/trunk/drivers/staging/me4000/me4000.c
index 8f0dbcc613fd..bfdf3e17d371 100644
--- a/trunk/drivers/staging/me4000/me4000.c
+++ b/trunk/drivers/staging/me4000/me4000.c
@@ -546,15 +546,13 @@ static void clear_board_info_list(void)
 				&board_info->ao_context_list, list) {
 			me4000_ao_reset(ao_context);
 			free_irq(ao_context->irq, ao_context);
-			if (ao_context->circ_buf.buf)
-				kfree(ao_context->circ_buf.buf);
+			kfree(ao_context->circ_buf.buf);
 			list_del(&ao_context->list);
 			kfree(ao_context);
 		}
 
 		/* Clear analog input context */
-		if (board_info->ai_context->circ_buf.buf)
-			kfree(board_info->ai_context->circ_buf.buf);
+		kfree(board_info->ai_context->circ_buf.buf);
 		kfree(board_info->ai_context);
 
 		/* Clear digital I/O context */
@@ -3668,8 +3666,7 @@ static int me4000_ai_config(struct me4000_ai_config *arg,
 	tmp &=
 	    ~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_SAMPLE_HOLD);
 
-	if (list)
-		kfree(list);
+	kfree(list);
 
 	return err;