summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-core.c
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2005-01-04 13:34:11 +0000
committerGerd Knorr <devnull@localhost>2005-01-04 13:34:11 +0000
commit5bac93165c075e9bde153e2abd14d5c5a550d90a (patch)
tree2e5645439d7ec0ddf8308985c03f0f1c93aeccc1 /linux/drivers/media/video/cx88/cx88-core.c
parentf1b127e9ddcfbc20cc21dbb6133c7e927b53682a (diff)
downloadmediapointer-dvb-s2-5bac93165c075e9bde153e2abd14d5c5a550d90a.tar.gz
mediapointer-dvb-s2-5bac93165c075e9bde153e2abd14d5c5a550d90a.tar.bz2
- fix irq initialization order bug.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c5
1 files changed, 2 insertions, 3 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;