From 1b6a8b86296a2091b61e005b855e815e0c69885c Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 10 Mar 2006 15:21:43 -0300 Subject: [PATCH] --- yaml --- r: 21715 b: refs/heads/master c: 6abe6bff6fc62832bc8cce3886b9670ba2542601 h: refs/heads/master i: 21713: 7c4369d2730c4f2bec1ffcfb6383d6c689d5d323 21711: 0b224856a672f5879e11241189b088d1b9dd2201 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dmxdev.c | 1 - trunk/drivers/media/dvb/dvb-core/dmxdev.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eb20c5ce5a71..4ae463dadd6f 100644 --- 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 index ab1aeb84c681..5cd2f98290ae 100644 --- 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 index 4cb879435fdb..5d4d18a00a68 100644 --- 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;