diff options
| author | Gerd Knorr <devnull@localhost> | 2005-01-04 13:34:11 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-01-04 13:34:11 +0000 |
| commit | 5bac93165c075e9bde153e2abd14d5c5a550d90a (patch) | |
| tree | 2e5645439d7ec0ddf8308985c03f0f1c93aeccc1 /linux/drivers/media | |
| parent | f1b127e9ddcfbc20cc21dbb6133c7e927b53682a (diff) | |
| download | mediapointer-dvb-s2-5bac93165c075e9bde153e2abd14d5c5a550d90a.tar.gz mediapointer-dvb-s2-5bac93165c075e9bde153e2abd14d5c5a550d90a.tar.bz2 | |
- fix irq initialization order bug.
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index be0351c54..67cd3c8ea 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.22 2004/12/17 11:51:37 kraxel Exp $ + * $Id: cx88-core.c,v 1.23 2005/01/04 13:34:11 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -71,7 +71,7 @@ MODULE_PARM_DESC(nicam,"tv audio is nicam"); static unsigned int nocomb = 0; module_param(nocomb,int,0644); -MODULE_PARM_DESC(nicam,"disable comb filter"); +MODULE_PARM_DESC(nocomb,"disable comb filter"); #define dprintk(level,fmt, arg...) if (core_debug >= level) \ printk(KERN_DEBUG "%s: " fmt, core->name , ## arg) @@ -1181,7 +1181,6 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci) cx88_i2c_init(core,pci); cx88_card_setup(core); cx88_ir_init(core,pci); - cx_write(MO_PCI_INTMSK, core->pci_irqmask); up(&devlist); return core; diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index fa0984ff5..e820ed269 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.17 2004/12/17 14:18:49 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.18 2005/01/04 13:34:11 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -323,6 +323,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs) int cx8802_init_common(struct cx8802_dev *dev) { + struct cx88_core *core = dev->core; int err; /* pci init */ @@ -367,6 +368,7 @@ int cx8802_init_common(struct cx8802_dev *dev) dev->core->name, dev->pci->irq); return err; } + cx_set(MO_PCI_INTMSK, core->pci_irqmask); #if 0 /* FIXME */ /* register i2c bus + load i2c helpers */ diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index bf338d56e..2e0b3db9c 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.51 2004/12/17 14:18:49 kraxel Exp $ + * $Id: cx88-video.c,v 1.52 2005/01/04 13:34:11 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2064,6 +2064,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, core->name,pci_dev->irq); goto fail_core; } + cx_set(MO_PCI_INTMSK, core->pci_irqmask); /* load and configure helper modules */ if (TUNER_ABSENT != core->tuner_type) |