aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stk-webcam.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
-rw-r--r--drivers/media/video/stk-webcam.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index b12c60cf5a0..f308c38d744 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -981,7 +981,7 @@ static int stk_vidioc_s_ctrl(struct file *filp,
981} 981}
982 982
983 983
984static int stk_vidioc_enum_fmt_cap(struct file *filp, 984static int stk_vidioc_enum_fmt_vid_cap(struct file *filp,
985 void *priv, struct v4l2_fmtdesc *fmtd) 985 void *priv, struct v4l2_fmtdesc *fmtd)
986{ 986{
987 fmtd->flags = 0; 987 fmtd->flags = 0;
@@ -1025,7 +1025,7 @@ static struct stk_size {
1025 { .w = 176, .h = 144, .m = MODE_QCIF, }, 1025 { .w = 176, .h = 144, .m = MODE_QCIF, },
1026}; 1026};
1027 1027
1028static int stk_vidioc_g_fmt_cap(struct file *filp, 1028static int stk_vidioc_g_fmt_vid_cap(struct file *filp,
1029 void *priv, struct v4l2_format *f) 1029 void *priv, struct v4l2_format *f)
1030{ 1030{
1031 struct v4l2_pix_format *pix_format = &f->fmt.pix; 1031 struct v4l2_pix_format *pix_format = &f->fmt.pix;
@@ -1054,7 +1054,7 @@ static int stk_vidioc_g_fmt_cap(struct file *filp,
1054 return 0; 1054 return 0;
1055} 1055}
1056 1056
1057static int stk_vidioc_try_fmt_cap(struct file *filp, 1057static int stk_vidioc_try_fmt_vid_cap(struct file *filp,
1058 void *priv, struct v4l2_format *fmtd) 1058 void *priv, struct v4l2_format *fmtd)
1059{ 1059{
1060 int i; 1060 int i;
@@ -1131,7 +1131,7 @@ static int stk_setup_format(struct stk_camera *dev)
1131 return stk_sensor_configure(dev); 1131 return stk_sensor_configure(dev);
1132} 1132}
1133 1133
1134static int stk_vidioc_s_fmt_cap(struct file *filp, 1134static int stk_vidioc_s_fmt_vid_cap(struct file *filp,
1135 void *priv, struct v4l2_format *fmtd) 1135 void *priv, struct v4l2_format *fmtd)
1136{ 1136{
1137 int ret; 1137 int ret;
@@ -1145,7 +1145,7 @@ static int stk_vidioc_s_fmt_cap(struct file *filp,
1145 return -EBUSY; 1145 return -EBUSY;
1146 if (dev->owner && dev->owner != filp) 1146 if (dev->owner && dev->owner != filp)
1147 return -EBUSY; 1147 return -EBUSY;
1148 ret = stk_vidioc_try_fmt_cap(filp, priv, fmtd); 1148 ret = stk_vidioc_try_fmt_vid_cap(filp, priv, fmtd);
1149 if (ret) 1149 if (ret)
1150 return ret; 1150 return ret;
1151 dev->owner = filp; 1151 dev->owner = filp;
@@ -1342,10 +1342,10 @@ static struct video_device stk_v4l_data = {
1342 .release = stk_v4l_dev_release, 1342 .release = stk_v4l_dev_release,
1343 1343
1344 .vidioc_querycap = stk_vidioc_querycap, 1344 .vidioc_querycap = stk_vidioc_querycap,
1345 .vidioc_enum_fmt_cap = stk_vidioc_enum_fmt_cap, 1345 .vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap,
1346 .vidioc_try_fmt_cap = stk_vidioc_try_fmt_cap, 1346 .vidioc_try_fmt_vid_cap = stk_vidioc_try_fmt_vid_cap,
1347 .vidioc_s_fmt_cap = stk_vidioc_s_fmt_cap, 1347 .vidioc_s_fmt_vid_cap = stk_vidioc_s_fmt_vid_cap,
1348 .vidioc_g_fmt_cap = stk_vidioc_g_fmt_cap, 1348 .vidioc_g_fmt_vid_cap = stk_vidioc_g_fmt_vid_cap,
1349 .vidioc_enum_input = stk_vidioc_enum_input, 1349 .vidioc_enum_input = stk_vidioc_enum_input,
1350 .vidioc_s_input = stk_vidioc_s_input, 1350 .vidioc_s_input = stk_vidioc_s_input,
1351 .vidioc_g_input = stk_vidioc_g_input, 1351 .vidioc_g_input = stk_vidioc_g_input,