raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 10:29:52 +00:00
Code Issues Projects Releases Wiki Activity

staging: bcm2835-camera: Fix warnings about string ops on v4l2 uapi.

Browse Source 
commit 40b73e1667 upstream.

The v4l2 uapi uses u8[] for strings, so cast those to char * to avoid
compiler warnings about unsigned vs signed with sprintf() and friends.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Anholt
2018-05-10 12:42:18 -07:00
committed by Phil Elwell
parent b58642124c
commit a84b7e7526
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View File

@@ -725,7 +725,7 @@ static int vidioc_enum_fmt_vid_overlay(struct file *file, void *priv,
fmt = &formats[f->index]; fmt = &formats[f->index];
strlcpy(f->description, fmt->name, sizeof(f->description)); strlcpy((char *)f->description, fmt->name, sizeof(f->description));
f->pixelformat = fmt->fourcc; f->pixelformat = fmt->fourcc;
f->flags = fmt->flags; f->flags = fmt->flags;
@@ -883,7 +883,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
inp->type = V4L2_INPUT_TYPE_CAMERA; inp->type = V4L2_INPUT_TYPE_CAMERA;
sprintf(inp->name, "Camera %u", inp->index); sprintf((char *)inp->name, "Camera %u", inp->index);
return 0; return 0;
} }
@@ -911,11 +911,11 @@ static int vidioc_querycap(struct file *file, void *priv,
vchiq_mmal_version(dev->instance, &major, &minor); vchiq_mmal_version(dev->instance, &major, &minor);
strcpy(cap->driver, "bm2835 mmal"); strcpy((char *)cap->driver, "bm2835 mmal");
snprintf(cap->card, sizeof(cap->card), "mmal service %d.%d", snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d",
major, minor); major, minor);
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf((char *)cap->bus_info, sizeof(cap->bus_info),
"platform:%s", dev->v4l2_dev.name); "platform:%s", dev->v4l2_dev.name);
cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY |
V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
@@ -934,7 +934,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
fmt = &formats[f->index]; fmt = &formats[f->index];
strlcpy(f->description, fmt->name, sizeof(f->description)); strlcpy((char *)f->description, fmt->name, sizeof(f->description));
f->pixelformat = fmt->fourcc; f->pixelformat = fmt->fourcc;
f->flags = fmt->flags; f->flags = fmt->flags;