diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 10:19:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 09:44:40 -0300 |
| commit | 0bde6c3e4c4d594eb66200e37d9aec6ed45a8543 (patch) | |
| tree | 7c0a9ee4e3e9dffc1f6ec4d23f45e66b381566bf /drivers/media/pci | |
| parent | 32cb3b09f4716583921d3244f67893441bfb9af2 (diff) | |
| download | linux-0bde6c3e4c4d594eb66200e37d9aec6ed45a8543.tar.bz2 | |
[media] bttv: fix querystd
AND the standard mask with the detected standards.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci')
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index bfcfa3e8543e..c6532de0eac7 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -1760,9 +1760,9 @@ static int bttv_querystd(struct file *file, void *f, v4l2_std_id *id) struct bttv *btv = fh->btv; if (btread(BT848_DSTATUS) & BT848_DSTATUS_NUML) - *id = V4L2_STD_625_50; + *id &= V4L2_STD_625_50; else - *id = V4L2_STD_525_60; + *id &= V4L2_STD_525_60; return 0; } |