summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-core/dmxdev.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/dmxdev.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/dmxdev.c')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dmxdev.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index b7034c0f2..aa9612cea 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -26,9 +26,11 @@
#include <linux/poll.h>
#include <asm/uaccess.h>
-#include "compat.h"
#include "dmxdev.h"
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+ #include "compat.h"
+#endif
//MODULE_DESCRIPTION("");
//MODULE_AUTHOR("Ralph Metzler, Marcus Metzler");
@@ -1141,7 +1143,8 @@ dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *dvb_adapter)
dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, dmxdev, DVB_DEVICE_DVR);
dvb_dmxdev_buffer_init(&dmxdev->dvr_buffer);
- MOD_INC_USE_COUNT;
+ /* fixme: is this correct? */
+ try_module_get(THIS_MODULE);
return 0;
}
@@ -1159,7 +1162,8 @@ dvb_dmxdev_release(dmxdev_t *dmxdev)
dmxdev->dvr=0;
}
dmxdev->demux->close(dmxdev->demux);
- MOD_DEC_USE_COUNT;
+ /* fixme: is this correct? */
+ module_put(THIS_MODULE);
}