---

yaml --- r: 21715 b: refs/heads/master c: 6abe6bf h: refs/heads/master i: 21713: 7c4369d 21711: 0b22485 v: v3
git-mirror · Mar 21, 2006 · 1b6a8b8 · 1b6a8b8
1 parent 785318b
commit 1b6a8b8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09794a6f95cf970d76e8b1c0ddd2b20a89f3dd88
+refs/heads/master: 6abe6bff6fc62832bc8cce3886b9670ba2542601
diff --git a/trunk/drivers/media/dvb/dvb-core/dmxdev.c b/trunk/drivers/media/dvb/dvb-core/dmxdev.c
@@ -694,7 +694,6 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
 
 	dmxdevfilter=&dmxdev->filter[i];
 	mutex_init(&dmxdevfilter->mutex);
-	dmxdevfilter->dvbdev=dmxdev->dvbdev;
 	file->private_data=dmxdevfilter;
 
 	dvb_dmxdev_buffer_init(&dmxdevfilter->buffer);

diff --git a/trunk/drivers/media/dvb/dvb-core/dmxdev.h b/trunk/drivers/media/dvb/dvb-core/dmxdev.h
@@ -62,8 +62,6 @@ struct dmxdev_buffer {
 };
 
 struct dmxdev_filter {
-	struct dvb_device *dvbdev;
-
 	union {
 		struct dmx_section_filter *sec;
 	} filter;