summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx/cx231xx-video.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-17 13:30:07 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 18:26:00 +0100
commita25a7012ba65ef41fba809c605c4f7d0dc609a23 (patch)
tree203d2109259fe2768be5f9a94a274f882f82bb8f /drivers/media/usb/cx231xx/cx231xx-video.c
parent[media] cx231xx: add struct v4l2_fh to get prio and event support (diff)
downloadlinux-a25a7012ba65ef41fba809c605c4f7d0dc609a23.tar.xz
linux-a25a7012ba65ef41fba809c605c4f7d0dc609a23.zip
[media] cx231xx: remove current_norm usage
The use of this field is deprecated since it will not work when multiple device nodes reference the same video input (the video and vbi nodes in this case). The norm field should be a device-global value. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to '')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 26d2a4fe74f1..ae27c8287d21 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -2230,7 +2230,6 @@ static const struct video_device cx231xx_video_template = {
.release = video_device_release,
.ioctl_ops = &video_ioctl_ops,
.tvnorms = V4L2_STD_ALL,
- .current_norm = V4L2_STD_PAL,
};
static const struct v4l2_file_operations radio_fops = {
@@ -2301,7 +2300,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
dev->name, CX231XX_VERSION);
/* set default norm */
- /*dev->norm = cx231xx_video_template.current_norm; */
+ dev->norm = V4L2_STD_PAL;
dev->width = norm_maxw(dev);
dev->height = norm_maxh(dev);
dev->interlaced = 0;