From 970e1381a5a2f8754c0f0a29dc0e083d203597a1 Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@kernellabs.com>
Date: Sat, 12 Dec 2009 17:38:53 -0300
Subject: [PATCH] --- yaml --- r: 181563 b: refs/heads/master c:
 1a8e0e33881c9dd8cf3514bfd0b5a7ef148da929 h: refs/heads/master i:   181561:
 5fd2d5a8ddc16f62f10c269fe8a83984a88ef0f4   181559:
 fc6cb7fa0ca022ddbb3566a8ae44b56d4ee30c9d v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/cx18/cx18-alsa-pcm.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a206b795c52c..b72f3c737f1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485e319adef5d33a1dca4320cb26fb387b4a9381
+refs/heads/master: 1a8e0e33881c9dd8cf3514bfd0b5a7ef148da929
diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
index 05cb8f1753b5..e14f8e42a2ab 100644
--- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -95,6 +95,7 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream)
 	/* See if the stream is available */
 	if (cx18_claim_stream(item, item->type)) {
 		/* No, it's already in use */
+		kfree(item);
 		return -EBUSY;
 	}