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/pwc | |
| 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/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-v4l.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c index 2876ce084..bdb4ced57 100644 --- a/linux/drivers/media/video/pwc/pwc-v4l.c +++ b/linux/drivers/media/video/pwc/pwc-v4l.c @@ -1033,7 +1033,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) if (std->index != 0) return -EINVAL; std->id = V4L2_STD_UNKNOWN; - strncpy(std->name, "webcam", sizeof(std->name)); + strlcpy(std->name, "webcam", sizeof(std->name)); return 0; } |