diff options
author | Patrice Chotard <patrice.chotard@sfr.fr> | 2012-12-15 17:11:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 15:21:20 -0500 |
commit | 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186 (patch) | |
tree | b759feed489aabb84b084199951325bf464f4991 /drivers/media/pci/ngene | |
parent | e7c953d280cea9a79018ae36e2bc7cedc3678de3 (diff) |
[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')
-rw-r--r-- | drivers/media/pci/ngene/ngene-cards.c | 8 |
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) | |||
327 | pr_err("No DRXD found!\n"); | 327 | pr_err("No DRXD found!\n"); |
328 | return -ENODEV; | 328 | return -ENODEV; |
329 | } | 329 | } |
330 | return 0; | ||
331 | } | ||
332 | |||
333 | static int tuner_attach_dtt7520x(struct ngene_channel *chan) | ||
334 | { | ||
335 | struct drxd_config *feconf; | ||
336 | |||
337 | feconf = chan->dev->card_info->fe_config[chan->number]; | ||
330 | 338 | ||
331 | if (!dvb_attach(dvb_pll_attach, chan->fe, feconf->pll_address, | 339 | if (!dvb_attach(dvb_pll_attach, chan->fe, feconf->pll_address, |
332 | &chan->i2c_adapter, | 340 | &chan->i2c_adapter, |