UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] tw686x-video: test for 60Hz instead of 50Hz 

When determining if the standard is 50 or 60 Hz it is standard
practice to test for 60 Hz instead of 50 Hz.

This doesn't matter normally, except if the user specifies both
60 and 50 Hz standards.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2016-04-21 03:23:58 -03:00 committed by Mauro Carvalho Chehab
parent e07d46e7e0
commit bde569874b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/pci/tw686x/tw686x-video.c
View File

@ -25,7 +25,7 @@
#define TW686X_INPUTS_PER_CH 4 #define TW686X_INPUTS_PER_CH 4
#define TW686X_VIDEO_WIDTH 720 #define TW686X_VIDEO_WIDTH 720
#define TW686X_VIDEO_HEIGHT(id) ((id & V4L2_STD_625_50) ? 576 : 480) #define TW686X_VIDEO_HEIGHT(id) ((id & V4L2_STD_525_60) ? 480 : 576)
static const struct tw686x_format formats[] = { static const struct tw686x_format formats[] = {
{ {
@ -517,10 +517,10 @@ static int tw686x_s_std(struct file *file, void *priv, v4l2_std_id id)
reg_write(vc->dev, SDT[vc->ch], val); reg_write(vc->dev, SDT[vc->ch], val);
val = reg_read(vc->dev, VIDEO_CONTROL1); val = reg_read(vc->dev, VIDEO_CONTROL1);
if (id & V4L2_STD_625_50) if (id & V4L2_STD_525_60)
val |= (1 << (SYS_MODE_DMA_SHIFT + vc->ch));
else
val &= ~(1 << (SYS_MODE_DMA_SHIFT + vc->ch)); val &= ~(1 << (SYS_MODE_DMA_SHIFT + vc->ch));
else
val |= (1 << (SYS_MODE_DMA_SHIFT + vc->ch));
reg_write(vc->dev, VIDEO_CONTROL1, val); reg_write(vc->dev, VIDEO_CONTROL1, val);
/* /*