[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>

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index bfcfa3e8543e8d4a8239d6bd4304d76948e3a0ad..c6532de0eac79652b1bbf6fefb8428cdced46fae 100644 (file)
--- 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;
 }