diff options
Diffstat (limited to 'drivers/media/usb/usbvision/usbvision-video.c')
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-video.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c index cd1fe78a5532..d34c2afe2c24 100644 --- a/drivers/media/usb/usbvision/usbvision-video.c +++ b/drivers/media/usb/usbvision/usbvision-video.c | |||
@@ -483,7 +483,7 @@ static int vidioc_g_register(struct file *file, void *priv, | |||
483 | } | 483 | } |
484 | 484 | ||
485 | static int vidioc_s_register(struct file *file, void *priv, | 485 | static int vidioc_s_register(struct file *file, void *priv, |
486 | struct v4l2_dbg_register *reg) | 486 | const struct v4l2_dbg_register *reg) |
487 | { | 487 | { |
488 | struct usb_usbvision *usbvision = video_drvdata(file); | 488 | struct usb_usbvision *usbvision = video_drvdata(file); |
489 | int err_code; | 489 | int err_code; |
@@ -595,11 +595,11 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int input) | |||
595 | return 0; | 595 | return 0; |
596 | } | 596 | } |
597 | 597 | ||
598 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) | 598 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) |
599 | { | 599 | { |
600 | struct usb_usbvision *usbvision = video_drvdata(file); | 600 | struct usb_usbvision *usbvision = video_drvdata(file); |
601 | 601 | ||
602 | usbvision->tvnorm_id = *id; | 602 | usbvision->tvnorm_id = id; |
603 | 603 | ||
604 | call_all(usbvision, core, s_std, usbvision->tvnorm_id); | 604 | call_all(usbvision, core, s_std, usbvision->tvnorm_id); |
605 | /* propagate the change to the decoder */ | 605 | /* propagate the change to the decoder */ |
@@ -628,7 +628,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
628 | } | 628 | } |
629 | 629 | ||
630 | static int vidioc_s_tuner(struct file *file, void *priv, | 630 | static int vidioc_s_tuner(struct file *file, void *priv, |
631 | struct v4l2_tuner *vt) | 631 | const struct v4l2_tuner *vt) |
632 | { | 632 | { |
633 | struct usb_usbvision *usbvision = video_drvdata(file); | 633 | struct usb_usbvision *usbvision = video_drvdata(file); |
634 | 634 | ||
@@ -657,7 +657,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
657 | } | 657 | } |
658 | 658 | ||
659 | static int vidioc_s_frequency(struct file *file, void *priv, | 659 | static int vidioc_s_frequency(struct file *file, void *priv, |
660 | struct v4l2_frequency *freq) | 660 | const struct v4l2_frequency *freq) |
661 | { | 661 | { |
662 | struct usb_usbvision *usbvision = video_drvdata(file); | 662 | struct usb_usbvision *usbvision = video_drvdata(file); |
663 | 663 | ||