aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-11-20 02:15:20 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:10:43 -0300
commit5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d (patch)
tree861f32b971772a080b613710618e4f6ebfaf5c50
parent1ec1c9bc6fc63b08467c12ce585862ae4e97859c (diff)
V4L/DVB: cx18-alsa: name alsa device after the actual card
Use the cx18 board name in the ALSA description, to make it easier for users who run "arecord -l" to see which device they should be looking for. Also, use strlcpy() instead of strcpy(). Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx18/cx18-alsa-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c
index 366194068e9..ec5851c7855 100644
--- a/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/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;