staging: bcm2835-camera: Fix warnings about string ops on v4l2 uapi.
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:
parent
6166045e79
commit
40b73e1667
|
@ -693,7 +693,7 @@ static int vidioc_enum_fmt_vid_overlay(struct file *file, void *priv,
|
|||
|
||||
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->flags = fmt->flags;
|
||||
|
||||
|
@ -851,7 +851,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
|
|||
return -EINVAL;
|
||||
|
||||
inp->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
sprintf(inp->name, "Camera %u", inp->index);
|
||||
sprintf((char *)inp->name, "Camera %u", inp->index);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -879,11 +879,11 @@ static int vidioc_querycap(struct file *file, void *priv,
|
|||
|
||||
vchiq_mmal_version(dev->instance, &major, &minor);
|
||||
|
||||
strcpy(cap->driver, "bm2835 mmal");
|
||||
snprintf(cap->card, sizeof(cap->card), "mmal service %d.%d",
|
||||
strcpy((char *)cap->driver, "bm2835 mmal");
|
||||
snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d",
|
||||
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);
|
||||
cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY |
|
||||
V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
|
||||
|
@ -902,7 +902,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
|||
|
||||
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->flags = fmt->flags;
|
||||
|
||||
|
|
Loading…
Reference in New Issue