1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6c0c94c5ef91..bfdca5847764 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -715,7 +715,8 @@ static int vidioc_querymenu (struct file *file, void *priv,
 
         qctrl.id = qmenu->id;
         blackbird_queryctrl(dev, &qctrl);
-        return v4l2_ctrl_query_menu(qmenu, &qctrl, cx2341x_ctrl_get_menu(qmenu->id));
+        return v4l2_ctrl_query_menu(qmenu, &qctrl,
+                        cx2341x_ctrl_get_menu(&dev->params, qmenu->id));
 }
 
 static int vidioc_querycap (struct file *file, void  *priv,
@@ -737,7 +738,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_enum_fmt_cap (struct file *file, void  *priv,
+static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
                                         struct v4l2_fmtdesc *f)
 {
         if (f->index != 0)
@@ -749,7 +750,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_g_fmt_cap (struct file *file, void *priv,
+static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct cx8802_fh  *fh   = priv;
@@ -768,7 +769,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_try_fmt_cap (struct file *file, void *priv,
+static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
                         struct v4l2_format *f)
 {
         struct cx8802_fh  *fh   = priv;
@@ -784,7 +785,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_s_fmt_cap (struct file *file, void *priv,
+static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct cx8802_fh  *fh   = priv;
@@ -1181,10 +1182,10 @@ static struct video_device cx8802_mpeg_template =
         .minor                = -1,
         .vidioc_querymenu     = vidioc_querymenu,
         .vidioc_querycap      = vidioc_querycap,
-        .vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,
-        .vidioc_g_fmt_cap     = vidioc_g_fmt_cap,
-        .vidioc_try_fmt_cap   = vidioc_try_fmt_cap,
-        .vidioc_s_fmt_cap     = vidioc_s_fmt_cap,
+        .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
+        .vidioc_try_fmt_vid_cap   = vidioc_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap     = vidioc_s_fmt_vid_cap,
         .vidioc_reqbufs       = vidioc_reqbufs,
         .vidioc_querybuf      = vidioc_querybuf,
         .vidioc_qbuf          = vidioc_qbuf,