V4L/DVB (11675): ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion
V4L2_TUNER_MODE_ was used in a few places where V4L2_TUNER_SUB_ should have been used. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
ec105a42ac
commit
dc47b77897
|
@ -153,7 +153,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
|
|||
mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;
|
||||
v->rangelow = RSF16_MINFREQ / mult;
|
||||
v->rangehigh = RSF16_MAXFREQ / mult;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
|
||||
v->capability = fmi->flags & V4L2_TUNER_CAP_LOW;
|
||||
v->audmode = V4L2_TUNER_MODE_STEREO;
|
||||
v->signal = fmi_getsigstr(fmi);
|
||||
|
|
|
@ -233,7 +233,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
|
|||
mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000;
|
||||
v->rangelow = RSF16_MINFREQ / mult;
|
||||
v->rangehigh = RSF16_MAXFREQ / mult;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO;
|
||||
v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
|
||||
v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW;
|
||||
v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO:
|
||||
V4L2_TUNER_MODE_MONO;
|
||||
|
|
|
@ -190,8 +190,8 @@ static int subdev_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
|
|||
|
||||
mask = itv->card->gpio_audio_detect.mask;
|
||||
if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask))
|
||||
vt->rxsubchans = V4L2_TUNER_MODE_STEREO |
|
||||
V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
|
||||
vt->rxsubchans = V4L2_TUNER_SUB_STEREO |
|
||||
V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
|
||||
else
|
||||
vt->rxsubchans = V4L2_TUNER_SUB_MONO;
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue