mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 04:47:05 +00:00
Code Issues Releases Wiki Activity

media: vidtv: properly initialize the internal state struct

Browse source 
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: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-09-13 13:08:05 +02:00
parent a6abe2f392
commit 96230dc134
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/test-drivers/vidtv/vidtv_demod.c
View file

@ -268,10 +268,6 @@ static int vidtv_demod_init(struct dvb_frontend *fe)
struct vidtv_demod_state *state = fe->demodulator_priv;
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
* 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)
state->poll_snr_thread_restart = false;
}
state->cold_start = false;
return 0;
}
@ -396,6 +391,7 @@ MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);
static int vidtv_demod_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct vidtv_tuner_config *config = client->dev.platform_data;
struct vidtv_demod_state *state;
/* allocate memory for the internal state */
@ -408,6 +404,10 @@ static int vidtv_demod_i2c_probe(struct i2c_client *client,
&vidtv_demod_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;
i2c_set_clientdata(client, state);

1
drivers/media/test-drivers/vidtv/vidtv_demod.h
View file

@ -66,7 +66,6 @@ struct vidtv_demod_state {
struct delayed_work poll_snr;
enum fe_status status;
u16 tuner_cnr;
bool cold_start;
bool poll_snr_thread_running;
bool poll_snr_thread_restart;
};