[media] tuner-core: fix s_std and s_tuner
Both s_std and s_tuner are broken because set_mode_freq is called before the new std (for s_std) and audmode (for s_tuner) are set. This patch splits set_mode_freq in a set_mode and a set_freq and in s_std/s_tuner first calls set_mode, and if that returns 0 (i.e. the mode is supported) then they set t->std/t->audmode and call set_freq. This fixes a bug where changing std or audmode would actually change it to the previous value. Discovered while testing analog TV standards for cx18 with a tda18271 tuner. Cc: stable@kernel.org Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
98c32bcded
commit
4e4a31fb95
|
@ -724,19 +724,15 @@ static inline int check_mode(struct tuner *t, enum v4l2_tuner_type mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set_mode_freq - Switch tuner to other mode.
|
* set_mode - Switch tuner to other mode.
|
||||||
* @client: struct i2c_client pointer
|
|
||||||
* @t: a pointer to the module's internal struct_tuner
|
* @t: a pointer to the module's internal struct_tuner
|
||||||
* @mode: enum v4l2_type (radio or TV)
|
* @mode: enum v4l2_type (radio or TV)
|
||||||
* @freq: frequency to set (0 means to use the previous one)
|
|
||||||
*
|
*
|
||||||
* If tuner doesn't support the needed mode (radio or TV), prints a
|
* If tuner doesn't support the needed mode (radio or TV), prints a
|
||||||
* debug message and returns -EINVAL, changing its state to standby.
|
* debug message and returns -EINVAL, changing its state to standby.
|
||||||
* Otherwise, changes the state and sets frequency to the last value, if
|
* Otherwise, changes the mode and returns 0.
|
||||||
* the tuner can sleep or if it supports both Radio and TV.
|
|
||||||
*/
|
*/
|
||||||
static int set_mode_freq(struct i2c_client *client, struct tuner *t,
|
static int set_mode(struct tuner *t, enum v4l2_tuner_type mode)
|
||||||
enum v4l2_tuner_type mode, unsigned int freq)
|
|
||||||
{
|
{
|
||||||
struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops;
|
struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops;
|
||||||
|
|
||||||
|
@ -752,19 +748,29 @@ static int set_mode_freq(struct i2c_client *client, struct tuner *t,
|
||||||
t->mode = mode;
|
t->mode = mode;
|
||||||
tuner_dbg("Changing to mode %d\n", mode);
|
tuner_dbg("Changing to mode %d\n", mode);
|
||||||
}
|
}
|
||||||
if (t->mode == V4L2_TUNER_RADIO) {
|
|
||||||
if (freq)
|
|
||||||
t->radio_freq = freq;
|
|
||||||
set_radio_freq(client, t->radio_freq);
|
|
||||||
} else {
|
|
||||||
if (freq)
|
|
||||||
t->tv_freq = freq;
|
|
||||||
set_tv_freq(client, t->tv_freq);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set_freq - Set the tuner to the desired frequency.
|
||||||
|
* @t: a pointer to the module's internal struct_tuner
|
||||||
|
* @freq: frequency to set (0 means to use the current frequency)
|
||||||
|
*/
|
||||||
|
static void set_freq(struct tuner *t, unsigned int freq)
|
||||||
|
{
|
||||||
|
struct i2c_client *client = v4l2_get_subdevdata(&t->sd);
|
||||||
|
|
||||||
|
if (t->mode == V4L2_TUNER_RADIO) {
|
||||||
|
if (!freq)
|
||||||
|
freq = t->radio_freq;
|
||||||
|
set_radio_freq(client, freq);
|
||||||
|
} else {
|
||||||
|
if (!freq)
|
||||||
|
freq = t->tv_freq;
|
||||||
|
set_tv_freq(client, freq);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Functions that are specific for TV mode
|
* Functions that are specific for TV mode
|
||||||
*/
|
*/
|
||||||
|
@ -1058,10 +1064,9 @@ static void tuner_status(struct dvb_frontend *fe)
|
||||||
static int tuner_s_radio(struct v4l2_subdev *sd)
|
static int tuner_s_radio(struct v4l2_subdev *sd)
|
||||||
{
|
{
|
||||||
struct tuner *t = to_tuner(sd);
|
struct tuner *t = to_tuner(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
||||||
|
|
||||||
if (set_mode_freq(client, t, V4L2_TUNER_RADIO, 0) == -EINVAL)
|
if (set_mode(t, V4L2_TUNER_RADIO) == 0)
|
||||||
return 0;
|
set_freq(t, 0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1093,25 +1098,22 @@ static int tuner_s_power(struct v4l2_subdev *sd, int on)
|
||||||
static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
|
static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
|
||||||
{
|
{
|
||||||
struct tuner *t = to_tuner(sd);
|
struct tuner *t = to_tuner(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
||||||
|
|
||||||
if (set_mode_freq(client, t, V4L2_TUNER_ANALOG_TV, 0) == -EINVAL)
|
if (set_mode(t, V4L2_TUNER_ANALOG_TV))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
t->std = std;
|
t->std = std;
|
||||||
tuner_fixup_std(t);
|
tuner_fixup_std(t);
|
||||||
|
set_freq(t, 0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tuner_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
|
static int tuner_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
|
||||||
{
|
{
|
||||||
struct tuner *t = to_tuner(sd);
|
struct tuner *t = to_tuner(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
||||||
|
|
||||||
if (set_mode_freq(client, t, f->type, f->frequency) == -EINVAL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
|
if (set_mode(t, f->type) == 0)
|
||||||
|
set_freq(t, f->frequency);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1180,13 +1182,13 @@ static int tuner_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
|
||||||
static int tuner_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
|
static int tuner_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
|
||||||
{
|
{
|
||||||
struct tuner *t = to_tuner(sd);
|
struct tuner *t = to_tuner(sd);
|
||||||
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
||||||
|
|
||||||
if (set_mode_freq(client, t, vt->type, 0) == -EINVAL)
|
if (set_mode(t, vt->type))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (t->mode == V4L2_TUNER_RADIO)
|
if (t->mode == V4L2_TUNER_RADIO)
|
||||||
t->audmode = vt->audmode;
|
t->audmode = vt->audmode;
|
||||||
|
set_freq(t, 0);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1221,7 +1223,8 @@ static int tuner_resume(struct i2c_client *c)
|
||||||
tuner_dbg("resume\n");
|
tuner_dbg("resume\n");
|
||||||
|
|
||||||
if (!t->standby)
|
if (!t->standby)
|
||||||
set_mode_freq(c, t, t->type, 0);
|
if (set_mode(t, t->type) == 0)
|
||||||
|
set_freq(t, 0);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue