---

yaml --- r: 92762 b: refs/heads/master c: 7dcc48f h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · e4d39f7 · e4d39f7
1 parent 5e85e5f
commit e4d39f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891d99efc5be16d2762bdbb9d0486f7250990eee
+refs/heads/master: 7dcc48fb55d18258e7db039f44a031e6828e6bad
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -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);
 
-	adap->digital_up = 1;
-
 	return 0;
 
 err_dmx_dev:
@@ -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)
 {
-	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/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.h
@@ -25,7 +25,6 @@ struct pvr2_dvb_adapter {
 	struct task_struct	*thread;
 	struct mutex		lock;
 
-	unsigned int		digital_up:1;
 	unsigned int		stream_run:1;
 
 	wait_queue_head_t	buffer_wait_data;