From: Devin Heitmueller Date: Fri, 20 Nov 2009 05:15:20 +0000 (-0300) Subject: V4L/DVB: cx18-alsa: name alsa device after the actual card X-Git-Tag: v3.12-rc1~11293^2~209 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c index 3661940..ec5851c 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;