summaryrefslogtreecommitdiff
path: root/drivers/media/usb/gspca/gspca.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-17 05:05:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 10:43:04 -0300
commitd88aab53bd267c9fb0b0451e9acae68091703eab (patch)
tree5da9b54e8fe4173a0a25b87bc350884d277f9bac /drivers/media/usb/gspca/gspca.h
parente6eb28c2207b9397d0ab56e238865a4ee95b7ef9 (diff)
downloadlinux-d88aab53bd267c9fb0b0451e9acae68091703eab.tar.gz
linux-d88aab53bd267c9fb0b0451e9acae68091703eab.tar.xz
[media] v4l2: make vidioc_s_jpegcomp const
Write-only ioctls should have a const argument in the ioctl op. Do this conversion for vidioc_s_jpegcomp. Adding const for write-only ioctls was decided during the 2012 Media Workshop. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/gspca/gspca.h')
-rw-r--r--drivers/media/usb/gspca/gspca.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h
index dc688c7f5e48..e3eab82cd4e5 100644
--- a/drivers/media/usb/gspca/gspca.h
+++ b/drivers/media/usb/gspca/gspca.h
@@ -83,8 +83,10 @@ struct gspca_frame;
typedef int (*cam_op) (struct gspca_dev *);
typedef void (*cam_v_op) (struct gspca_dev *);
typedef int (*cam_cf_op) (struct gspca_dev *, const struct usb_device_id *);
-typedef int (*cam_jpg_op) (struct gspca_dev *,
+typedef int (*cam_get_jpg_op) (struct gspca_dev *,
struct v4l2_jpegcompression *);
+typedef int (*cam_set_jpg_op) (struct gspca_dev *,
+ const struct v4l2_jpegcompression *);
typedef int (*cam_reg_op) (struct gspca_dev *,
struct v4l2_dbg_register *);
typedef int (*cam_ident_op) (struct gspca_dev *,
@@ -126,8 +128,8 @@ struct sd_desc {
cam_v_op stopN; /* called on stream off - main alt */
cam_v_op stop0; /* called on stream off & disconnect - alt 0 */
cam_v_op dq_callback; /* called when a frame has been dequeued */
- cam_jpg_op get_jcomp;
- cam_jpg_op set_jcomp;
+ cam_get_jpg_op get_jcomp;
+ cam_set_jpg_op set_jcomp;
cam_qmnu_op querymenu;
cam_streamparm_op get_streamparm;
cam_streamparm_op set_streamparm;