aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx18/cx18-ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/cx18/cx18-ioctl.c')
-rw-r--r--drivers/media/pci/cx18/cx18-ioctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 173ccd204c1f..254c50fabd73 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -637,15 +637,15 @@ static int cx18_g_std(struct file *file, void *fh, v4l2_std_id *std)
637 return 0; 637 return 0;
638} 638}
639 639
640int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std) 640int cx18_s_std(struct file *file, void *fh, v4l2_std_id std)
641{ 641{
642 struct cx18_open_id *id = fh2id(fh); 642 struct cx18_open_id *id = fh2id(fh);
643 struct cx18 *cx = id->cx; 643 struct cx18 *cx = id->cx;
644 644
645 if ((*std & V4L2_STD_ALL) == 0) 645 if ((std & V4L2_STD_ALL) == 0)
646 return -EINVAL; 646 return -EINVAL;
647 647
648 if (*std == cx->std) 648 if (std == cx->std)
649 return 0; 649 return 0;
650 650
651 if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) || 651 if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags) ||
@@ -656,8 +656,8 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std)
656 return -EBUSY; 656 return -EBUSY;
657 } 657 }
658 658
659 cx->std = *std; 659 cx->std = std;
660 cx->is_60hz = (*std & V4L2_STD_525_60) ? 1 : 0; 660 cx->is_60hz = (std & V4L2_STD_525_60) ? 1 : 0;
661 cx->is_50hz = !cx->is_60hz; 661 cx->is_50hz = !cx->is_60hz;
662 cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz); 662 cx2341x_handler_set_50hz(&cx->cxhdl, cx->is_50hz);
663 cx->cxhdl.width = 720; 663 cx->cxhdl.width = 720;