Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / drivers / media / platform / omap / omap_vout.c

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index ba2d8f973d580aca85e4195dd9d9eb68cf86568e..1566684c7d404a3bedd656e66caf881d9cdb786d 100644 (file)
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -63,7 +63,6 @@ enum omap_vout_channels {
        OMAP_VIDEO2,
 };
 
-static struct videobuf_queue_ops video_vbq_ops;
 /* Variables configurable through module params*/
 static u32 video1_numbuffers = 3;
 static u32 video2_numbuffers = 3;
@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
 {
        struct videobuf_queue *q;
        struct omap_vout_device *vout = NULL;
+       static struct videobuf_queue_ops video_vbq_ops = {
+               .buf_setup = omap_vout_buffer_setup,
+               .buf_prepare = omap_vout_buffer_prepare,
+               .buf_release = omap_vout_buffer_release,
+               .buf_queue = omap_vout_buffer_queue,
+       };
 
        vout = video_drvdata(file);
        v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
        vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
 
        q = &vout->vbq;
-       video_vbq_ops.buf_setup = omap_vout_buffer_setup;
-       video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
-       video_vbq_ops.buf_release = omap_vout_buffer_release;
-       video_vbq_ops.buf_queue = omap_vout_buffer_queue;
        spin_lock_init(&vout->vbq_lock);
 
        videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,