lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Other pvrusb2-dvb changes have made the digital_up flag obsolete.  So
kill it.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mike Isely
2008-02-09 15:55:54 -03:00
committed by Mauro Carvalho Chehab
parent 891d99efc5
commit 7dcc48fb55
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/pvrusb2/pvrusb2-dvb.c
View File

@@ -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 @@ err:
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;
} }

1
drivers/media/video/pvrusb2/pvrusb2-dvb.h
View File

@@ -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;