summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-v4l.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 13:56:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 13:56:01 -0300
commit136a9b83fb4cb819c2f27cbb5948d26cec0e7934 (patch)
tree397919f977ae7937aa60a5001f62f0ba3faef2db /linux/drivers/media/video/pwc/pwc-v4l.c
parentfdafaa4f7e2ea516dbd7791f362f05273aaaa6cc (diff)
parentc5d1ee111d9e00f9ce75e48e5e3806fdcd681a83 (diff)
downloadmediapointer-dvb-s2-136a9b83fb4cb819c2f27cbb5948d26cec0e7934.tar.gz
mediapointer-dvb-s2-136a9b83fb4cb819c2f27cbb5948d26cec0e7934.tar.bz2
merge: http://kernellabs.com/hg/~mkrufky/tda18271-merge
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-v4l.c')
-rw-r--r--linux/drivers/media/video/pwc/pwc-v4l.c2
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;
}