From a0e7d2e873c1423d29b37a44d2d9e80bf1026cb8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 23 Sep 2012 16:42:44 -0300
Subject: [PATCH] --- yaml --- r: 331037 b: refs/heads/master c:
 fac44ee564a54db020ad384e0de94b5d8be3c6b5 h: refs/heads/master i:   331035:
 faa81f707e31a5015ccb2ce45c1e0d29ff49eeb4 v: v3

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

diff --git a/[refs] b/[refs]
index 0ef28d41b210..607fa1275ecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da35de640a0e9c805aba70439f524234890b96c5
+refs/heads/master: fac44ee564a54db020ad384e0de94b5d8be3c6b5
diff --git a/trunk/drivers/media/usb/tlg2300/pd-alsa.c b/trunk/drivers/media/usb/tlg2300/pd-alsa.c
index 0c778695e2c3..3f3e141f70fb 100644
--- a/trunk/drivers/media/usb/tlg2300/pd-alsa.c
+++ b/trunk/drivers/media/usb/tlg2300/pd-alsa.c
@@ -306,7 +306,7 @@ int poseidon_audio_init(struct poseidon *p)
 
 	ret = snd_pcm_new(card, "poseidon audio", 0, 0, 1, &pcm);
 	if (ret < 0) {
-		snd_free_card(card);
+		snd_card_free(card);
 		return ret;
 	}
 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_capture_ops);