[media] vivid: enable the vivid driver

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / vivi.c

diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index d00bf3df0f8a0bf6bf34996fa454ffdbd763d7e1..80333714ffa7498e3a63af827d3549468d0664de 100644 (file)
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -648,13 +648,13 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
        gen_text(dev, vbuf, line++ * 16, 16, str);
        snprintf(str, sizeof(str), " int32 %d, int64 %lld, bitmask %08x ",
                        dev->int32->cur.val,
-                       dev->int64->cur.val64,
+                       *dev->int64->p_cur.p_s64,
                        dev->bitmask->cur.val);
        gen_text(dev, vbuf, line++ * 16, 16, str);
        snprintf(str, sizeof(str), " boolean %d, menu %s, string \"%s\" ",
                        dev->boolean->cur.val,
                        dev->menu->qmenu[dev->menu->cur.val],
-                       dev->string->cur.string);
+                       dev->string->p_cur.p_char);
        gen_text(dev, vbuf, line++ * 16, 16, str);
        snprintf(str, sizeof(str), " integer_menu %lld, value %d ",
                        dev->int_menu->qmenu_int[dev->int_menu->cur.val],
@@ -1014,7 +1014,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
        else
                f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
-       f->fmt.pix.priv = 0;
        return 0;
 }
 
@@ -1236,7 +1235,7 @@ static const struct v4l2_ctrl_config vivi_ctrl_int32 = {
        .id = VIVI_CID_CUSTOM_BASE + 2,
        .name = "Integer 32 Bits",
        .type = V4L2_CTRL_TYPE_INTEGER,
-       .min = 0x80000000,
+       .min = -0x80000000LL,
        .max = 0x7fffffff,
        .step = 1,
 };
@@ -1246,6 +1245,9 @@ static const struct v4l2_ctrl_config vivi_ctrl_int64 = {
        .id = VIVI_CID_CUSTOM_BASE + 3,
        .name = "Integer 64 Bits",
        .type = V4L2_CTRL_TYPE_INTEGER64,
+       .min = LLONG_MIN,
+       .max = LLONG_MAX,
+       .step = 1,
 };
 
 static const char * const vivi_ctrl_menu_strings[] = {
@@ -1459,7 +1461,6 @@ static int __init vivi_create_instance(int inst)
        vfd->debug = debug;
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->queue = q;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
 
        /*
         * Provide a mutex to v4l2 core. It will be used to protect