Commit 7dcc48fb authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab

V4L/DVB (7690): pvrusb2-dvb: Remove digital_up flag

Other pvrusb2-dvb changes have made the digital_up flag obsolete.  So
kill it.
Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 891d99ef
...@@ -293,8 +293,6 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap) ...@@ -293,8 +293,6 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap)
dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx); dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
adap->digital_up = 1;
return 0; return 0;
err_dmx_dev: err_dmx_dev:
...@@ -307,15 +305,12 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap) ...@@ -307,15 +305,12 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap)
static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap) static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap)
{ {
if (adap->digital_up) { printk(KERN_DEBUG "unregistering DVB devices\n");
printk(KERN_DEBUG "unregistering DVB devices\n"); dvb_net_release(&adap->dvb_net);
dvb_net_release(&adap->dvb_net); adap->demux.dmx.close(&adap->demux.dmx);
adap->demux.dmx.close(&adap->demux.dmx); dvb_dmxdev_release(&adap->dmxdev);
dvb_dmxdev_release(&adap->dmxdev); dvb_dmx_release(&adap->demux);
dvb_dmx_release(&adap->demux); dvb_unregister_adapter(&adap->dvb_adap);
dvb_unregister_adapter(&adap->dvb_adap);
adap->digital_up = 0;
}
return 0; return 0;
} }
......
...@@ -25,7 +25,6 @@ struct pvr2_dvb_adapter { ...@@ -25,7 +25,6 @@ struct pvr2_dvb_adapter {
struct task_struct *thread; struct task_struct *thread;
struct mutex lock; struct mutex lock;
unsigned int digital_up:1;
unsigned int stream_run:1; unsigned int stream_run:1;
wait_queue_head_t buffer_wait_data; wait_queue_head_t buffer_wait_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment