Commit 3d4b8035 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fafdc26b

drivers/media/i2c/tvaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/pci/bt8xx/bttv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -2787,9 +2787,9 @@ static int bttv_g_tuner(struct file *file, void *priv, 
		return -EINVAL;



	t->rxsubchans = V4L2_TUNER_SUB_MONO;

	t->capability = V4L2_TUNER_CAP_NORM;

	bttv_call_all(btv, tuner, g_tuner, t);

	strcpy(t->name, "Television");

	t->capability = V4L2_TUNER_CAP_NORM;

	t->type       = V4L2_TUNER_ANALOG_TV;

	if (btread(BT848_DSTATUS)&BT848_DSTATUS_HLOC)

		t->signal = 0xffff;