leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] tuner-core.c: don't change type field in g_tuner or g_frequency

Browse Source 
The tuner core should not silently change the type field in g_tuner and
g_frequency. If the tuner is in a different mode than the one that was
requested, then just fill in what you can and don't attempt to read afc,
signal or rxsubchans values.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2011-06-26 05:35:34 -03:00 committed by Mauro Carvalho Chehab
parent d118e294e2
commit 5ad339a298
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/video/tuner-core.c
View File

@ -1101,8 +1101,7 @@ static int tuner_g_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
if (check_mode(t, f->type) == -EINVAL) if (check_mode(t, f->type) == -EINVAL)
return 0; return 0;
f->type = t->mode; if (f->type == t->mode && fe_tuner_ops->get_frequency && !t->standby) {
if (fe_tuner_ops->get_frequency && !t->standby) {
u32 abs_freq; u32 abs_freq;
fe_tuner_ops->get_frequency(&t->fe, &abs_freq); fe_tuner_ops->get_frequency(&t->fe, &abs_freq);
@ -1110,7 +1109,7 @@ static int tuner_g_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
DIV_ROUND_CLOSEST(abs_freq * 2, 125) : DIV_ROUND_CLOSEST(abs_freq * 2, 125) :
DIV_ROUND_CLOSEST(abs_freq, 62500); DIV_ROUND_CLOSEST(abs_freq, 62500);
} else { } else {
f->frequency = (V4L2_TUNER_RADIO == t->mode) ? f->frequency = (V4L2_TUNER_RADIO == f->type) ?
t->radio_freq : t->tv_freq; t->radio_freq : t->tv_freq;
} }
return 0; return 0;
@ -1134,32 +1133,33 @@ static int tuner_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
if (check_mode(t, vt->type) == -EINVAL) if (check_mode(t, vt->type) == -EINVAL)
return 0; return 0;
vt->type = t->mode; if (vt->type == t->mode && analog_ops->get_afc)
if (analog_ops->get_afc)
vt->afc = analog_ops->get_afc(&t->fe); vt->afc = analog_ops->get_afc(&t->fe);
if (t->mode == V4L2_TUNER_ANALOG_TV) if (vt->type == V4L2_TUNER_ANALOG_TV)
vt->capability |= V4L2_TUNER_CAP_NORM; vt->capability |= V4L2_TUNER_CAP_NORM;
if (t->mode != V4L2_TUNER_RADIO) { if (vt->type != V4L2_TUNER_RADIO) {
vt->rangelow = tv_range[0] * 16; vt->rangelow = tv_range[0] * 16;
vt->rangehigh = tv_range[1] * 16; vt->rangehigh = tv_range[1] * 16;
return 0; return 0;
} }
/* radio mode */ /* radio mode */
vt->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; if (vt->type == t->mode) {
if (fe_tuner_ops->get_status) { vt->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
u32 tuner_status; if (fe_tuner_ops->get_status) {
u32 tuner_status;
fe_tuner_ops->get_status(&t->fe, &tuner_status); fe_tuner_ops->get_status(&t->fe, &tuner_status);
vt->rxsubchans = vt->rxsubchans =
(tuner_status & TUNER_STATUS_STEREO) ? (tuner_status & TUNER_STATUS_STEREO) ?
V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_STEREO :
V4L2_TUNER_SUB_MONO; V4L2_TUNER_SUB_MONO;
}
if (analog_ops->has_signal)
vt->signal = analog_ops->has_signal(&t->fe);
vt->audmode = t->audmode;
} }
if (analog_ops->has_signal)
vt->signal = analog_ops->has_signal(&t->fe);
vt->capability |= V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO; vt->capability |= V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
vt->audmode = t->audmode;
vt->rangelow = radio_range[0] * 16000; vt->rangelow = radio_range[0] * 16000;
vt->rangehigh = radio_range[1] * 16000; vt->rangehigh = radio_range[1] * 16000;