diff options
| author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-04-06 13:42:46 +0100 |
|---|---|---|
| committer | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-04-06 13:42:46 +0100 |
| commit | 7a1e768ccdb212dd6997320abc369c21b6522a2d (patch) | |
| tree | db21794e685437613ee0607e92dbb74661c5dd1c /linux | |
| parent | 90b3eeab5b4a9004ebe62de315b0be80835332c5 (diff) | |
| download | mediapointer-dvb-s2-7a1e768ccdb212dd6997320abc369c21b6522a2d.tar.gz mediapointer-dvb-s2-7a1e768ccdb212dd6997320abc369c21b6522a2d.tar.bz2 | |
Fix oops in budget-av with CI
From: Andrew de Quincey <adq_dvb@lidskialf.net>
Now that the CI code reinitialises the frontend, need to move the CI
initialisation to after the frontend init in order to ensure the frontend is
always in a good state. Fixes an oops caused by the frontend being NULL as
well.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-av.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index 8efe3ce5f..8a7cd7d50 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -1190,8 +1190,6 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio SAA7146_HPS_SYNC_PORT_A); saa7113_setinput(budget_av, 0); - } else { - ciintf_init(budget_av); } /* fixme: find some sane values here... */ @@ -1211,6 +1209,10 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio budget_av->budget.dvb_adapter.priv = budget_av; frontend_init(budget_av); + if (!budget_av->has_saa7113) { + ciintf_init(budget_av); + } + return 0; } |