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;