diff options
| author | Hans Verkuil | 2018-05-14 14:51:44 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-05-25 21:30:30 +0200 |
| commit | ba17f7805f655b56a8b8ee8f8c106a2bda123c1e (patch) | |
| tree | 9e0bb903683439e722da55b894bf6acfd8afb582 /drivers/staging/media | |
| parent | media: go7007: fix two sparse warnings (diff) | |
| download | kernel-qcow2-linux-ba17f7805f655b56a8b8ee8f8c106a2bda123c1e.tar.gz kernel-qcow2-linux-ba17f7805f655b56a8b8ee8f8c106a2bda123c1e.tar.xz kernel-qcow2-linux-ba17f7805f655b56a8b8ee8f8c106a2bda123c1e.zip | |
media: zoran: fix compiler warning
In file included from media-git/include/linux/bitmap.h:9,
from media-git/include/linux/cpumask.h:12,
from media-git/arch/x86/include/asm/cpumask.h:5,
from media-git/arch/x86/include/asm/msr.h:11,
from media-git/arch/x86/include/asm/processor.h:21,
from media-git/arch/x86/include/asm/cpufeature.h:5,
from media-git/arch/x86/include/asm/thread_info.h:53,
from media-git/include/linux/thread_info.h:38,
from media-git/arch/x86/include/asm/preempt.h:7,
from media-git/include/linux/preempt.h:81,
from media-git/include/linux/spinlock.h:51,
from media-git/include/linux/seqlock.h:36,
from media-git/include/linux/time.h:6,
from media-git/include/linux/stat.h:19,
from media-git/include/linux/module.h:10,
from media-git/drivers/staging/media/zoran/zoran_driver.c:44:
In function 'strncpy',
inlined from 'zoran_querycap' at media-git/drivers/staging/media/zoran/zoran_driver.c:1512:2:
media-git/include/linux/string.h:246:9: warning: '__builtin_strncpy' output may be truncated copying 31 bytes from a string of length 31 [-Wstringop-truncation]
return __builtin_strncpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/zoran/zoran_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index 14f9c0e26a1c..d2e13fffbc6b 100644 --- a/drivers/staging/media/zoran/zoran_driver.c +++ b/drivers/staging/media/zoran/zoran_driver.c @@ -1509,8 +1509,8 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability struct zoran_fh *fh = __fh; struct zoran *zr = fh->zr; - strncpy(cap->card, ZR_DEVNAME(zr), sizeof(cap->card)-1); - strncpy(cap->driver, "zoran", sizeof(cap->driver)-1); + strlcpy(cap->card, ZR_DEVNAME(zr), sizeof(cap->card)); + strlcpy(cap->driver, "zoran", sizeof(cap->driver)); snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", pci_name(zr->pci_dev)); cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE | |