diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-31 08:15:17 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-13 14:38:50 (GMT) |
| commit | d13ac96f576ef23670d9e65f8f3771b17fd6dce1 (patch) | |
| tree | fea9b29ed2f6cbf34c4e17561922f04c85167ae5 /drivers | |
| parent | ed3e12d2b03f756f09433f08c4606cdc61ffbc7c (diff) | |
| download | linux-d13ac96f576ef23670d9e65f8f3771b17fd6dce1.tar.xz | |
[media] ml86v7667: fix the querystd implementation
The *std should be set to V4L2_STD_UNKNOWN, not the function's return code.
Also, *std should be ANDed with 525_60 or 625_50.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/i2c/ml86v7667.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c index 0f256d3..cd9f86e 100644 --- a/drivers/media/i2c/ml86v7667.c +++ b/drivers/media/i2c/ml86v7667.c @@ -169,10 +169,10 @@ static int ml86v7667_querystd(struct v4l2_subdev *sd, v4l2_std_id *std) if (status < 0) return status; - if (!(status & STATUS_HLOCK_DETECT)) - return V4L2_STD_UNKNOWN; - - *std = status & STATUS_NTSCPAL ? V4L2_STD_625_50 : V4L2_STD_525_60; + if (status & STATUS_HLOCK_DETECT) + *std &= status & STATUS_NTSCPAL ? V4L2_STD_625_50 : V4L2_STD_525_60; + else + *std = V4L2_STD_UNKNOWN; return 0; } |