aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/zoran/zoran_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/zoran/zoran_driver.c')
-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 2e8f518f298f..1168a84a737d 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2435,14 +2435,14 @@ static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std)
2435 return 0; 2435 return 0;
2436} 2436}
2437 2437
2438static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id *std) 2438static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std)
2439{ 2439{
2440 struct zoran_fh *fh = __fh; 2440 struct zoran_fh *fh = __fh;
2441 struct zoran *zr = fh->zr; 2441 struct zoran *zr = fh->zr;
2442 int res = 0; 2442 int res = 0;
2443 2443
2444 mutex_lock(&zr->resource_lock); 2444 mutex_lock(&zr->resource_lock);
2445 res = zoran_set_norm(zr, *std); 2445 res = zoran_set_norm(zr, std);
2446 if (res) 2446 if (res)
2447 goto sstd_unlock_and_return; 2447 goto sstd_unlock_and_return;
2448 2448