From 96fb028f781ec20cd37fa814454948cb9c140681 Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 13 Mar 2011 00:29:02 -0500
Subject: [PATCH] --- yaml --- r: 236457 b: refs/heads/master c:
 43c04d42c3c5a23e2aff330d4d361c733118df80 h: refs/heads/master i:   236455:
 e81a090ea6673b8ea3cbd00ecd900df3456cec89 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/line6/pcm.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bb431ff18448..27bae44e1f6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 306be9e1c167dcd7d6635bd434ee8e63ab22a5d6
+refs/heads/master: 43c04d42c3c5a23e2aff330d4d361c733118df80
diff --git a/trunk/drivers/staging/line6/pcm.c b/trunk/drivers/staging/line6/pcm.c
index b9c55f9eb501..9d4c8a606eea 100644
--- a/trunk/drivers/staging/line6/pcm.c
+++ b/trunk/drivers/staging/line6/pcm.c
@@ -189,8 +189,7 @@ int line6_pcm_stop(struct snd_line6_pcm *line6pcm, int channels)
 		line6pcm->buffer_out = NULL;
 	}
 #if LINE6_BACKUP_MONITOR_SIGNAL
-	if (line6pcm->prev_fbuf != NULL)
-		kfree(line6pcm->prev_fbuf);
+	kfree(line6pcm->prev_fbuf);
 #endif
 
 	return 0;