summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core/dvbdev.c
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2003-03-20 09:56:57 +0000
committerMichael Hunold <devnull@localhost>2003-03-20 09:56:57 +0000
commitdab9ea33014f096f57a109767f77a48c544bcbb4 (patch)
treee91686163e24c2de98c5f084487436e33ee408f7 /linux/drivers/media/dvb/dvb-core/dvbdev.c
parent5797f42d3ed47493db6ec2b904a9e8df10969f90 (diff)
downloadmediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.gz
mediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.bz2
Small changes all over the place:
- sync Kconfig and Makefiles with 2.5.65 - fix various things in saa7146 because of latest v4l changes in 2.5.65 - makelinks: removed the compat module from the 2.5.x build process - makelinks: removed the linkage of ttusb and bt8xx -- enable this again for the next patches, when ttusb is more stable and the bt8xx related patches have been applied by Gerd Knorr - dvb: removed the compat module from the 2.5.x build process, added #ifdefs around the inclusion of compat.h. this was necessary because having compat code in the newest 2.5.x kernel is awkward. - dvb: move around of dvb_usercopy again. because I removed the compat module from the 2.5.x build process, dvb_usercopy had to be moved to another file - dvb: change MOD_*_USE_COUNT to module_get/module_put in various files, but I'm not sure if I did this right. please review these changes. - dvb: removed the crc32 code from dvb_demux.c, because it's in compat.c, too. - dvb: removed some cruft from dvd_i2c.c, which is present in compat.h - all files: apply small fixes to reflect the new location of some header files
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dvbdev.c')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvbdev.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index d3a9ca092..71929aafb 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -39,7 +39,10 @@
#include <linux/slab.h>
#include "dvbdev.h"
-#include "compat.h"
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+ #include "compat.h"
+#endif
static int dvbdev_debug = 0;
#define dprintk if (dvbdev_debug) printk
@@ -301,7 +304,8 @@ int dvb_register_adapter(struct dvb_adapter **padap, const char *name)
memset (adap, 0, sizeof(struct dvb_adapter));
INIT_LIST_HEAD (&adap->device_list);
- MOD_INC_USE_COUNT;
+ /* fixme: is this correct? */
+ try_module_get(THIS_MODULE);
printk ("DVB: registering new adapter (%s).\n", name);
@@ -326,7 +330,8 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
list_del (&adap->list_head);
up (&dvbdev_register_lock);
kfree (adap);
- MOD_DEC_USE_COUNT;
+ /* fixme: is this correct? */
+ module_put(THIS_MODULE);
return 0;
}