From 23ca8ea7e2a2cbe080fd849fd2457d75a2581a30 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 4 Sep 2012 10:43:26 -0300
Subject: [PATCH] --- yaml --- r: 331036 b: refs/heads/master c:
 da35de640a0e9c805aba70439f524234890b96c5 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/usb/tlg2300/pd-alsa.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a75c49b11bc..0ef28d41b210 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4699903e4f765af7f9d7b3d63c576290c375c47d
+refs/heads/master: da35de640a0e9c805aba70439f524234890b96c5
diff --git a/trunk/drivers/media/usb/tlg2300/pd-alsa.c b/trunk/drivers/media/usb/tlg2300/pd-alsa.c
index 9f8b7da56b67..0c778695e2c3 100644
--- a/trunk/drivers/media/usb/tlg2300/pd-alsa.c
+++ b/trunk/drivers/media/usb/tlg2300/pd-alsa.c
@@ -305,6 +305,10 @@ int poseidon_audio_init(struct poseidon *p)
 		return ret;
 
 	ret = snd_pcm_new(card, "poseidon audio", 0, 0, 1, &pcm);
+	if (ret < 0) {
+		snd_free_card(card);
+		return ret;
+	}
 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_capture_ops);
 	pcm->info_flags   = 0;
 	pcm->private_data = p;