From 5fd2d5a8ddc16f62f10c269fe8a83984a88ef0f4 Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@kernellabs.com>
Date: Fri, 20 Nov 2009 02:15:20 -0300
Subject: [PATCH] --- yaml --- r: 181561 b: refs/heads/master c:
 5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d h: refs/heads/master i:   181559:
 fc6cb7fa0ca022ddbb3566a8ae44b56d4ee30c9d v: v3

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

diff --git a/[refs] b/[refs]
index f6237958ce75..eba52089f5cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec1c9bc6fc63b08467c12ce585862ae4e97859c
+refs/heads/master: 5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d
diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
index 366194068e92..ec5851c7855d 100644
--- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -344,7 +344,7 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc)
 	snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, &snd_cx18_pcm_capture_ops);
 	sp->info_flags = 0;
 	sp->private_data = cxsc;
-	strcpy(sp->name, "Conexant cx23418 Capture");
+	strlcpy(sp->name, cx->card_name, sizeof(sp->name));
 
 	return 0;