diff options
| author | Michael Krufky <mkrufky@kernellabs.com> | 2009-08-30 08:07:10 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-19 05:13:47 +0200 |
| commit | d5abef6be1715040ac50e834bc042031f7613fa9 (patch) | |
| tree | 496a99bc85a06f542ba75b193f89bc6df06480f0 /drivers/media/common | |
| parent | V4L/DVB (12866): tda18271: move small_i2c assignment to the state config block (diff) | |
| download | linux-d5abef6be1715040ac50e834bc042031f7613fa9.tar.xz linux-d5abef6be1715040ac50e834bc042031f7613fa9.zip | |
V4L/DVB (12867): tda18271: ensure that configuration options are set for multiple instances
For the case of multiple tuner instances, ensure that non-default
configuration options are saved into the driver's state.
This resolves an issue where a configuration option may not be
carried into the driver if the analog side of a hybrid driver
initializes before the digital side.
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
| -rw-r--r-- | drivers/media/common/tuners/tda18271-fe.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c index 063c7987d310..152df76cdce8 100644 --- a/drivers/media/common/tuners/tda18271-fe.c +++ b/drivers/media/common/tuners/tda18271-fe.c @@ -1258,9 +1258,19 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr, /* existing tuner instance */ fe->tuner_priv = priv; - /* allow dvb driver to override i2c gate setting */ - if ((cfg) && (cfg->gate != TDA18271_GATE_ANALOG)) - priv->gate = cfg->gate; + /* allow dvb driver to override configuration settings */ + if (cfg) { + if (cfg->gate != TDA18271_GATE_ANALOG) + priv->gate = cfg->gate; + if (cfg->role) + priv->role = cfg->role; + if (cfg->config) + priv->config = cfg->config; + if (cfg->small_i2c) + priv->small_i2c = cfg->small_i2c; + if (cfg->output_opt) + priv->output_opt = cfg->output_opt; + } break; } |