Commit 96230dc1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: vidtv: properly initialize the internal state struct

Right now, the config data passed from the bridge driver is
just ignored.

Also, let's initialize the delayed work at probing time.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent a6abe2f3
...@@ -268,10 +268,6 @@ static int vidtv_demod_init(struct dvb_frontend *fe) ...@@ -268,10 +268,6 @@ static int vidtv_demod_init(struct dvb_frontend *fe)
struct vidtv_demod_state *state = fe->demodulator_priv; struct vidtv_demod_state *state = fe->demodulator_priv;
u32 tuner_status = 0; u32 tuner_status = 0;
if (state->cold_start)
INIT_DELAYED_WORK(&state->poll_snr,
&vidtv_demod_poll_snr_handler);
/* /*
* At resume, start the snr poll thread only if it was suspended with * At resume, start the snr poll thread only if it was suspended with
* the thread running. Extra care should be taken here, as some tuner * the thread running. Extra care should be taken here, as some tuner
...@@ -288,7 +284,6 @@ static int vidtv_demod_init(struct dvb_frontend *fe) ...@@ -288,7 +284,6 @@ static int vidtv_demod_init(struct dvb_frontend *fe)
state->poll_snr_thread_restart = false; state->poll_snr_thread_restart = false;
} }
state->cold_start = false;
return 0; return 0;
} }
...@@ -396,6 +391,7 @@ MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table); ...@@ -396,6 +391,7 @@ MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);
static int vidtv_demod_i2c_probe(struct i2c_client *client, static int vidtv_demod_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct vidtv_tuner_config *config = client->dev.platform_data;
struct vidtv_demod_state *state; struct vidtv_demod_state *state;
/* allocate memory for the internal state */ /* allocate memory for the internal state */
...@@ -408,6 +404,10 @@ static int vidtv_demod_i2c_probe(struct i2c_client *client, ...@@ -408,6 +404,10 @@ static int vidtv_demod_i2c_probe(struct i2c_client *client,
&vidtv_demod_ops, &vidtv_demod_ops,
sizeof(struct dvb_frontend_ops)); sizeof(struct dvb_frontend_ops));
memcpy(&state->config, config, sizeof(state->config));
INIT_DELAYED_WORK(&state->poll_snr, &vidtv_demod_poll_snr_handler);
state->frontend.demodulator_priv = state; state->frontend.demodulator_priv = state;
i2c_set_clientdata(client, state); i2c_set_clientdata(client, state);
......
...@@ -66,7 +66,6 @@ struct vidtv_demod_state { ...@@ -66,7 +66,6 @@ struct vidtv_demod_state {
struct delayed_work poll_snr; struct delayed_work poll_snr;
enum fe_status status; enum fe_status status;
u16 tuner_cnr; u16 tuner_cnr;
bool cold_start;
bool poll_snr_thread_running; bool poll_snr_thread_running;
bool poll_snr_thread_restart; bool poll_snr_thread_restart;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment