---

yaml --- r: 330630 b: refs/heads/master c: dd5e52c h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 437b386 · 437b386
1 parent aab1f06
commit 437b386
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dca4ea3ecb3d33ce49a9bb7d1f40a75bbea8aec
+refs/heads/master: dd5e52cdf9e2518e79b634fa2ae1cc86e37cff14
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -288,7 +288,6 @@ struct dvb_usb_adapter {
 	int (*fe_sleep[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);
 
 	int active_fe;
-	int num_frontends_initialized;
 };
 
 /**

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -386,8 +386,6 @@ int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 		}
 	}
 
-	adap->num_frontends_initialized = count_registered;
-
 	return 0;
 
 err_dvb_unregister_frontend:
@@ -410,14 +408,12 @@ int dvb_usbv2_adapter_frontend_exit(struct dvb_usb_adapter *adap)
 	int i;
 	pr_debug("%s: adap=%d\n", __func__, adap->id);
 
-	for (i = adap->num_frontends_initialized - 1; i >= 0; i--) {
+	for (i = MAX_NO_OF_FE_PER_ADAP - 1; i >= 0; i--) {
 		if (adap->fe[i]) {
 			dvb_unregister_frontend(adap->fe[i]);
 			dvb_frontend_detach(adap->fe[i]);
 		}
 	}
 
-	adap->num_frontends_initialized = 0;
-
 	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,7 +288,6 @@ struct dvb_usb_adapter { @@
     	int (*fe_sleep[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);
     	int active_fe;
-    	int num_frontends_initialized;
     };
     /**
@@ Expand Down @@