aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-empress.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 3ae71a340822..e11700eb3e5a 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -208,7 +208,7 @@ static int empress_s_input(struct file *file, void *priv, unsigned int i)
208 return 0; 208 return 0;
209} 209}
210 210
211static int empress_enum_fmt_cap(struct file *file, void *priv, 211static int empress_enum_fmt_vid_cap(struct file *file, void *priv,
212 struct v4l2_fmtdesc *f) 212 struct v4l2_fmtdesc *f)
213{ 213{
214 if (f->index != 0) 214 if (f->index != 0)
@@ -220,7 +220,7 @@ static int empress_enum_fmt_cap(struct file *file, void *priv,
220 return 0; 220 return 0;
221} 221}
222 222
223static int empress_g_fmt_cap(struct file *file, void *priv, 223static int empress_g_fmt_vid_cap(struct file *file, void *priv,
224 struct v4l2_format *f) 224 struct v4l2_format *f)
225{ 225{
226 struct saa7134_dev *dev = file->private_data; 226 struct saa7134_dev *dev = file->private_data;
@@ -233,7 +233,7 @@ static int empress_g_fmt_cap(struct file *file, void *priv,
233 return 0; 233 return 0;
234} 234}
235 235
236static int empress_s_fmt_cap(struct file *file, void *priv, 236static int empress_s_fmt_vid_cap(struct file *file, void *priv,
237 struct v4l2_format *f) 237 struct v4l2_format *f)
238{ 238{
239 struct saa7134_dev *dev = file->private_data; 239 struct saa7134_dev *dev = file->private_data;
@@ -348,9 +348,9 @@ static struct video_device saa7134_empress_template =
348 .minor = -1, 348 .minor = -1,
349 349
350 .vidioc_querycap = empress_querycap, 350 .vidioc_querycap = empress_querycap,
351 .vidioc_enum_fmt_cap = empress_enum_fmt_cap, 351 .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap,
352 .vidioc_s_fmt_cap = empress_s_fmt_cap, 352 .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap,
353 .vidioc_g_fmt_cap = empress_g_fmt_cap, 353 .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap,
354 .vidioc_reqbufs = empress_reqbufs, 354 .vidioc_reqbufs = empress_reqbufs,
355 .vidioc_querybuf = empress_querybuf, 355 .vidioc_querybuf = empress_querybuf,
356 .vidioc_qbuf = empress_qbuf, 356 .vidioc_qbuf = empress_qbuf,