aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/zoran
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/zoran')
-rw-r--r--drivers/media/pci/zoran/zoran_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index f91b551e6a52..9ecd7d711f27 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2674,7 +2674,7 @@ static int zoran_g_jpegcomp(struct file *file, void *__fh,
2674} 2674}
2675 2675
2676static int zoran_s_jpegcomp(struct file *file, void *__fh, 2676static int zoran_s_jpegcomp(struct file *file, void *__fh,
2677 struct v4l2_jpegcompression *params) 2677 const struct v4l2_jpegcompression *params)
2678{ 2678{
2679 struct zoran_fh *fh = __fh; 2679 struct zoran_fh *fh = __fh;
2680 struct zoran *zr = fh->zr; 2680 struct zoran *zr = fh->zr;
@@ -2701,7 +2701,7 @@ static int zoran_s_jpegcomp(struct file *file, void *__fh,
2701 if (!fh->buffers.allocated) 2701 if (!fh->buffers.allocated)
2702 fh->buffers.buffer_size = 2702 fh->buffers.buffer_size =
2703 zoran_v4l2_calc_bufsize(&fh->jpg_settings); 2703 zoran_v4l2_calc_bufsize(&fh->jpg_settings);
2704 fh->jpg_settings.jpg_comp = *params = settings.jpg_comp; 2704 fh->jpg_settings.jpg_comp = settings.jpg_comp;
2705sjpegc_unlock_and_return: 2705sjpegc_unlock_and_return:
2706 mutex_unlock(&zr->resource_lock); 2706 mutex_unlock(&zr->resource_lock);
2707 2707