From: Mauro Carvalho Chehab Date: Tue, 2 Sep 2014 20:58:59 +0000 (-0300) Subject: [media] vivid: Don't declare .vidioc_overlay twice X-Git-Tag: firefly_0821_release~176^2~2474^2~762 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=20504fa92d072d427d1eaaa47f71f9fb60d6c43a;p=firefly-linux-kernel-4.4.55.git [media] vivid: Don't declare .vidioc_overlay twice Removes the following warnings: drivers/media/platform/vivid/vivid-core.c:581:2: warning: initialized field overwritten [-Woverride-init] .vidioc_overlay = vidioc_overlay, ^ drivers/media/platform/vivid/vivid-core.c:581:2: warning: (near initialization for 'vivid_ioctl_ops.vidioc_overlay') [-Woverride-init] Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 708b0530d9cf..fb3b0aad33ed 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -578,7 +578,6 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_g_fmt_vid_out_overlay = vidioc_g_fmt_vid_out_overlay, .vidioc_try_fmt_vid_out_overlay = vidioc_try_fmt_vid_out_overlay, .vidioc_s_fmt_vid_out_overlay = vidioc_s_fmt_vid_out_overlay, - .vidioc_overlay = vidioc_overlay, .vidioc_g_fbuf = vidioc_g_fbuf, .vidioc_s_fbuf = vidioc_s_fbuf,