Skip to content

L
linux-davinci
Commit 48aa336a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (6473): Prevents double tuner registering 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 690c544c
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
drivers/media/video/tuner-core.c
View file @ 48aa336a
...@@ -279,8 +279,7 @@ static void set_type(struct i2c_client *c, unsigned int type, ...@@ -279,8 +279,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
t->tuner_callback = tuner_callback; t->tuner_callback = tuner_callback;
} }
/* This code detects calls by card attach_inform */ if (t->mode == T_UNINITIALIZED) {
if (NULL == t->i2c.dev.driver) {
tuner_dbg ("tuner 0x%02x: called during i2c_client register by adapter's attach_inform\n", c->addr); tuner_dbg ("tuner 0x%02x: called during i2c_client register by adapter's attach_inform\n", c->addr);
return; return;
...@@ -684,6 +683,16 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -684,6 +683,16 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
/* Should be just before return */ /* Should be just before return */
register_client: register_client:
tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name); tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
/* Sets a default mode */
if (t->mode_mask & T_ANALOG_TV) {
t->mode = T_ANALOG_TV;
} else if (t->mode_mask & T_RADIO) {
t->mode = T_RADIO;
} else {
t->mode = T_DIGITAL_TV;
}
i2c_attach_client (client); i2c_attach_client (client);
set_type (client,t->type, t->mode_mask, t->config, t->tuner_callback); set_type (client,t->type, t->mode_mask, t->config, t->tuner_callback);
return 0; return 0;
......
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