diff options
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index 02ccd96d5e52..0127be9c2549 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -1831,10 +1831,10 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width, | |||
1831 | frameRate = FRAMERATE_MAX; | 1831 | frameRate = FRAMERATE_MAX; |
1832 | } | 1832 | } |
1833 | 1833 | ||
1834 | if (usbvision->tvnorm->id & V4L2_STD_625_50) { | 1834 | if (usbvision->tvnormId & V4L2_STD_625_50) { |
1835 | frameDrop = frameRate * 32 / 25 - 1; | 1835 | frameDrop = frameRate * 32 / 25 - 1; |
1836 | } | 1836 | } |
1837 | else if (usbvision->tvnorm->id & V4L2_STD_525_60) { | 1837 | else if (usbvision->tvnormId & V4L2_STD_525_60) { |
1838 | frameDrop = frameRate * 32 / 30 - 1; | 1838 | frameDrop = frameRate * 32 / 30 - 1; |
1839 | } | 1839 | } |
1840 | 1840 | ||
@@ -2067,7 +2067,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision) | |||
2067 | } | 2067 | } |
2068 | 2068 | ||
2069 | 2069 | ||
2070 | if (usbvision->tvnorm->id & V4L2_STD_PAL) { | 2070 | if (usbvision->tvnormId & V4L2_STD_PAL) { |
2071 | value[0] = 0xC0; | 2071 | value[0] = 0xC0; |
2072 | value[1] = 0x02; //0x02C0 -> 704 Input video line length | 2072 | value[1] = 0x02; //0x02C0 -> 704 Input video line length |
2073 | value[2] = 0x20; | 2073 | value[2] = 0x20; |
@@ -2076,7 +2076,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision) | |||
2076 | value[5] = 0x00; //0x0060 -> 96 Input video h offset | 2076 | value[5] = 0x00; //0x0060 -> 96 Input video h offset |
2077 | value[6] = 0x16; | 2077 | value[6] = 0x16; |
2078 | value[7] = 0x00; //0x0016 -> 22 Input video v offset | 2078 | value[7] = 0x00; //0x0016 -> 22 Input video v offset |
2079 | } else if (usbvision->tvnorm->id & V4L2_STD_SECAM) { | 2079 | } else if (usbvision->tvnormId & V4L2_STD_SECAM) { |
2080 | value[0] = 0xC0; | 2080 | value[0] = 0xC0; |
2081 | value[1] = 0x02; //0x02C0 -> 704 Input video line length | 2081 | value[1] = 0x02; //0x02C0 -> 704 Input video line length |
2082 | value[2] = 0x20; | 2082 | value[2] = 0x20; |