diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:56:40 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:56:40 -0300 |
commit | 6971a9d650f6ab06dfedc4464665366c87da4bbc (patch) | |
tree | 6274d376e8d2ee13a4fecb2d0f9e294bc35935ef /linux/drivers/media/video/zoran/zoran_card.c | |
parent | 6355bbe94603dee693331f5ae62c8c1a109a8007 (diff) | |
parent | 796c449e9807bc070a33bcbbab2f4cae6cfc6d14 (diff) | |
download | mediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.gz mediapointer-dvb-s2-6971a9d650f6ab06dfedc4464665366c87da4bbc.tar.bz2 |
merge: http://www.kernellabs.com/hg/~dheitmueller/ttxs-remote/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_card.c')
-rw-r--r-- | linux/drivers/media/video/zoran/zoran_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c index 217fec9e4..375f158fd 100644 --- a/linux/drivers/media/video/zoran/zoran_card.c +++ b/linux/drivers/media/video/zoran/zoran_card.c @@ -1169,7 +1169,7 @@ zoran_setup_videocodec (struct zoran *zr, m->type = 0; m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER; - strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name)); + strlcpy(m->name, ZR_DEVNAME(zr), sizeof(m->name)); m->data = zr; switch (type) |