diff options
| author | Christopher Pascoe <devnull@localhost> | 2004-10-15 13:15:26 +0000 |
|---|---|---|
| committer | Christopher Pascoe <devnull@localhost> | 2004-10-15 13:15:26 +0000 |
| commit | cebd98855dacf877014ea8f47d069e5d60aaad63 (patch) | |
| tree | 1f0b630c4c2286bf04453b99adf8ae757aa15628 /linux/drivers/media/dvb/bt8xx | |
| parent | 3aab516671baf08a091ff7e0afae63539929998e (diff) | |
| download | mediapointer-dvb-s2-cebd98855dacf877014ea8f47d069e5d60aaad63.tar.gz mediapointer-dvb-s2-cebd98855dacf877014ea8f47d069e5d60aaad63.tar.bz2 | |
Fix misplaced #endif which may cause problems with pinnaclesat cards.
Print a message suggesting that a failure to find the DMA core for a card
could be the result of having the ALSA bt87x audio driver loaded.
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index b239065df..8cd16f73d 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -231,6 +231,7 @@ static int dvb_bt8xx_probe(struct device *dev) case BTTV_PINNACLESAT: #ifdef BTTV_DVICO_DVBT_LITE case BTTV_DVICO_DVBT_LITE: +#endif card->gpio_mode = 0x0400C060; card->op_sync_orin = 0; card->irq_err_ignore = 0; @@ -238,7 +239,7 @@ static int dvb_bt8xx_probe(struct device *dev) * A_PWRDN DA_DPM DA_SBR DA_IOM_DA * DA_APP(parallel) */ break; -#endif + case BTTV_NEBULA_DIGITV: case BTTV_AVDVBT_761: card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5); @@ -288,7 +289,10 @@ static int dvb_bt8xx_probe(struct device *dev) } if (!(card->bt = dvb_bt8xx_878_match(card->bttv_nr, bttv_pci_dev))) { - printk("dvb_bt8xx: unable to determine DMA core of card %d\n", card->bttv_nr); + printk("dvb_bt8xx: unable to determine DMA core of card %d,\n", + card->bttv_nr); + printk("dvb_bt8xx: if you have the ALSA bt87x audio driver " + "installed, try removing it.\n"); kfree(card); return -EFAULT; |