diff options
Diffstat (limited to 'drivers/media/usb/cpia2')
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_v4l.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c index 5ca6f44b4c63..aeb9d2275725 100644 --- a/drivers/media/usb/cpia2/cpia2_v4l.c +++ b/drivers/media/usb/cpia2/cpia2_v4l.c | |||
@@ -734,7 +734,8 @@ static int cpia2_g_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres | |||
734 | * | 734 | * |
735 | *****************************************************************************/ | 735 | *****************************************************************************/ |
736 | 736 | ||
737 | static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompression *parms) | 737 | static int cpia2_s_jpegcomp(struct file *file, void *fh, |
738 | const struct v4l2_jpegcompression *parms) | ||
738 | { | 739 | { |
739 | struct camera_data *cam = video_drvdata(file); | 740 | struct camera_data *cam = video_drvdata(file); |
740 | 741 | ||
@@ -743,8 +744,6 @@ static int cpia2_s_jpegcomp(struct file *file, void *fh, struct v4l2_jpegcompres | |||
743 | 744 | ||
744 | cam->params.compression.inhibit_htables = | 745 | cam->params.compression.inhibit_htables = |
745 | !(parms->jpeg_markers & V4L2_JPEG_MARKER_DHT); | 746 | !(parms->jpeg_markers & V4L2_JPEG_MARKER_DHT); |
746 | parms->jpeg_markers &= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI | | ||
747 | V4L2_JPEG_MARKER_DHT; | ||
748 | 747 | ||
749 | if(parms->APP_len != 0) { | 748 | if(parms->APP_len != 0) { |
750 | if(parms->APP_len > 0 && | 749 | if(parms->APP_len > 0 && |