summaryrefslogtreecommitdiff
path: root/drivers/media/i2c/tvaudio.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-06 19:44:07 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 21:23:59 +0400
commit3d4b8035050dbca905ab55ecc0a0de16f9ef11bf (patch)
tree6303a41b45fc66fcc4bf403f6433ab488817a24c /drivers/media/i2c/tvaudio.c
parentfafdc26b8558838988f406abef27d6dcc5b3dd76 (diff)
downloadlinux-3d4b8035050dbca905ab55ecc0a0de16f9ef11bf.tar.xz
[media] bttv: fix g_tuner capabilities override
The capability field of v4l2_tuner should be ORed by the various subdevs and by the main driver. In this case the stereo capability was dropped. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c/tvaudio.c')
-rw-r--r--drivers/media/i2c/tvaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index e3b33b78dd21..4c91b355b55a 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -1803,7 +1803,7 @@ static int tvaudio_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
vt->audmode = chip->audmode;
vt->rxsubchans = desc->getrxsubchans(chip);
- vt->capability = V4L2_TUNER_CAP_STEREO |
+ vt->capability |= V4L2_TUNER_CAP_STEREO |
V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
return 0;