diff options
| author | Mike Isely <isely@pobox.com> | 2008-02-09 09:55:54 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2008-02-09 09:55:54 -0600 |
| commit | c2d538737e28749e6b8d83a83e67809bd93bb805 (patch) | |
| tree | 87cfb6dc2ba9862a61e8a9e7decf4165bdef673e /linux/drivers/media | |
| parent | bcb7a4b2043e2028c86e25326af40f548e4b1c92 (diff) | |
| download | mediapointer-dvb-s2-c2d538737e28749e6b8d83a83e67809bd93bb805.tar.gz mediapointer-dvb-s2-c2d538737e28749e6b8d83a83e67809bd93bb805.tar.bz2 | |
pvrusb2-dvb: Remove digital_up flag
From: Mike Isely <isely@pobox.com>
Other pvrusb2-dvb changes have made the digital_up flag obsolete. So
kill it.
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c | 17 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h | 1 |
2 files changed, 6 insertions, 12 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c index a12b5a1ba..0c06e8753 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c @@ -311,8 +311,6 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap) dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx); - adap->digital_up = 1; - return 0; err_dmx_dev: @@ -325,15 +323,12 @@ err: static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap) { - if (adap->digital_up) { - printk(KERN_DEBUG "unregistering DVB devices\n"); - dvb_net_release(&adap->dvb_net); - adap->demux.dmx.close(&adap->demux.dmx); - dvb_dmxdev_release(&adap->dmxdev); - dvb_dmx_release(&adap->demux); - dvb_unregister_adapter(&adap->dvb_adap); - adap->digital_up = 0; - } + printk(KERN_DEBUG "unregistering DVB devices\n"); + dvb_net_release(&adap->dvb_net); + adap->demux.dmx.close(&adap->demux.dmx); + dvb_dmxdev_release(&adap->dmxdev); + dvb_dmx_release(&adap->demux); + dvb_unregister_adapter(&adap->dvb_adap); return 0; } diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h index effa2f46c..f6b8199a5 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.h @@ -29,7 +29,6 @@ struct pvr2_dvb_adapter { struct semaphore lock; #endif - unsigned int digital_up:1; unsigned int stream_run:1; wait_queue_head_t buffer_wait_data; |