diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
| commit | 6802e30de304059d908100b6874f246c45c47792 (patch) | |
| tree | 357f49ba2ac92fe05facd95981bf51888e2afe8d /linux/drivers/media/common/tuners | |
| parent | 53c5d79124323a6862c2ec0f3c73edba4f35eb89 (diff) | |
| parent | 976a91082e499203f3700aa589a54aefedc3c22a (diff) | |
| download | mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.gz mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common/tuners')
| -rw-r--r-- | linux/drivers/media/common/tuners/xc5000.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/common/tuners/xc5000.c b/linux/drivers/media/common/tuners/xc5000.c index b0e20bc20..39c415df0 100644 --- a/linux/drivers/media/common/tuners/xc5000.c +++ b/linux/drivers/media/common/tuners/xc5000.c @@ -992,8 +992,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, case 1: /* new tuner instance */ priv->bandwidth = BANDWIDTH_6_MHZ; - priv->if_khz = cfg->if_khz; - fe->tuner_priv = priv; break; default: @@ -1002,6 +1000,13 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, break; } + if (priv->if_khz == 0) { + /* If the IF hasn't been set yet, use the value provided by + the caller (occurs in hybrid devices where the analog + call to xc5000_attach occurs before the digital side) */ + priv->if_khz = cfg->if_khz; + } + /* Check if firmware has been loaded. It is possible that another instance of the driver has loaded the firmware. */ |