diff options
| author | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
|---|---|---|
| committer | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
| commit | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (patch) | |
| tree | a73819bc4ad336cafcf90648613eabd96cc23f7f /linux/drivers/media/dvb/dvb-core | |
| parent | 3cdabc5516eb8974b43dc1febf8010d550c1de65 (diff) | |
| parent | 2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d (diff) | |
| download | mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.gz mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.bz2 | |
merge: from main
From: Patrick Boettcher <pb@linuxtv.org>
merge: from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dmxdev.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index 04578df3f..988499dfd 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -872,9 +872,6 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, mutex_unlock(&dmxdevfilter->mutex); break; - case DMX_GET_EVENT: - break; - case DMX_GET_PES_PIDS: if (!dmxdev->demux->get_pes_pids) { ret = -EINVAL; diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 123ea8344..041ed7fd1 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -93,7 +93,11 @@ static int dvb_device_open(struct inode *inode, struct file *file) if (dvbdev && dvbdev->fops) { int err = 0; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) + const struct file_operations *old_fops; +#else struct file_operations *old_fops; +#endif file->private_data = dvbdev; old_fops = file->f_op; @@ -226,8 +230,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, return -ENOMEM; } - mutex_unlock(&dvbdev_register_lock); - memcpy(dvbdev, template, sizeof(struct dvb_device)); dvbdev->type = type; dvbdev->id = id; @@ -238,6 +240,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, list_add_tail (&dvbdev->list_head, &adap->device_list); + mutex_unlock(&dvbdev_register_lock); + devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), S_IFCHR | S_IRUSR | S_IWUSR, "dvb/adapter%d/%s%d", adap->num, dnames[type], id); |