On 21 Apr 08:50 AM, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> 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@xxxxxxxxx>
Acked-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
Thanks for the fixes!
> ---
> drivers/media/pci/tw686x/tw686x-video.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c
> index 9a31de9..9cfee0a 100644
> --- a/drivers/media/pci/tw686x/tw686x-video.c
> +++ b/drivers/media/pci/tw686x/tw686x-video.c
> @@ -25,7 +25,7 @@
>
> #define TW686X_INPUTS_PER_CH 4
> #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[] = {
> {
> @@ -518,10 +518,10 @@ static int tw686x_s_std(struct file *file, void *priv, v4l2_std_id id)
> reg_write(vc->dev, SDT[vc->ch], val);
>
> val = reg_read(vc->dev, VIDEO_CONTROL1);
> - if (id & V4L2_STD_625_50)
> - val |= (1 << (SYS_MODE_DMA_SHIFT + vc->ch));
> - else
> + if (id & V4L2_STD_525_60)
> val &= ~(1 << (SYS_MODE_DMA_SHIFT + vc->ch));
> + else
> + val |= (1 << (SYS_MODE_DMA_SHIFT + vc->ch));
> reg_write(vc->dev, VIDEO_CONTROL1, val);
>
> /*
> --
> 2.8.0.rc3
>
--
Ezequiel Garcia, VanguardiaSur
www.vanguardiasur.com.ar
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
