diff options
author | Patrick Boettcher <devnull@localhost> | 2005-03-11 15:40:18 +0000 |
---|---|---|
committer | Patrick Boettcher <devnull@localhost> | 2005-03-11 15:40:18 +0000 |
commit | f52f342aca2a889e3f40a18f6f658f6be0e6370d (patch) | |
tree | 031adf35bf2015b4b0855eacbe22a39e9c07f9ce | |
parent | d39d6e54b5640e55b4e70de65e257f44e3bbb7a1 (diff) | |
download | mediapointer-dvb-s2-f52f342aca2a889e3f40a18f6f658f6be0e6370d.tar.gz mediapointer-dvb-s2-f52f342aca2a889e3f40a18f6f658f6be0e6370d.tar.bz2 |
- patch by Amit Gud (unify the spinlock initialization)
- debug parameter can be changed via sysfs by root now
-rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-pci.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/dvb/b2c2/skystar2.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c index 97968ca06..cea47437a 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c @@ -28,7 +28,7 @@ MODULE_PARM_DESC(enable_pid_filtering, "enable hardware pid filtering: supported #define deb_irq(args...) dprintk(0x08,args) static int debug = 0; -module_param(debug, int, 0444); +module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debug level (1=info,2=regs,4=TS,8=irqdma (|-able))." DEBSTATUS); #define DRIVER_VERSION "0.1" @@ -213,7 +213,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) u8 card_rev; pci_read_config_byte(fc_pci->pdev, PCI_CLASS_REVISION, &card_rev); - info("card revision %x\n", card_rev); + info("card revision %x", card_rev); if ((ret = pci_enable_device(fc_pci->pdev)) != 0) return ret; diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index 6fb7de1b2..e3eab1f73 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -1,6 +1,5 @@ -/* ATTENTION: before chaning any significant here, please consult b2c2/ - * in dvb-kernel-CVS. There is an approach to rewrite this drivers to make use - * code sharing between pci and usb. +/* ATTENTION: do not change anything here, please see the flexcop* files in + * this directory. */ /* @@ -1972,7 +1971,7 @@ static int driver_initialize(struct pci_dev *pdev) ctrl_enable_mac(adapter, 1); } - adapter->lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&adapter->lock); out: return ret; |