summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ngene/ngene-cards.c
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@sfr.fr>2012-12-15 19:11:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-27 18:21:20 -0200
commit36a495a336c3fbbb2f4eeed2a94ab6d5be19d186 (patch)
treeb759feed489aabb84b084199951325bf464f4991 /drivers/media/pci/ngene/ngene-cards.c
parente7c953d280cea9a79018ae36e2bc7cedc3678de3 (diff)
downloadlinux-36a495a336c3fbbb2f4eeed2a94ab6d5be19d186.tar.bz2
[media] ngene: separate demodulator and tuner attach
Previously, demodulator and tuner attach was done in the demod_attach callback. Migrate the tuner part in the tuner_attach callback in ngene_info to do thing in right place. Signed-off-by: Patrice Chotard <patricechotard@free.fr> Reviewed-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/ngene/ngene-cards.c')
-rw-r--r--drivers/media/pci/ngene/ngene-cards.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index b38bce529566..2a4895b0706b 100644
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -327,6 +327,14 @@ static int demod_attach_drxd(struct ngene_channel *chan)
pr_err("No DRXD found!\n");
return -ENODEV;
}
+ return 0;
+}
+
+static int tuner_attach_dtt7520x(struct ngene_channel *chan)
+{
+ struct drxd_config *feconf;
+
+ feconf = chan->dev->card_info->fe_config[chan->number];
if (!dvb_attach(dvb_pll_attach, chan->fe, feconf->pll_address,
&chan->i2c_adapter,