---

yaml --- r: 330583 b: refs/heads/master c: 1c9c73b h: refs/heads/master i: 330581: bb735b1 330579: b95b2e8 330575: edda215 v: v3
git-mirror · Aug 4, 2012 · ef19da5 · ef19da5
1 parent 9abb98d
commit ef19da5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20bb9cc483e1dc78ce7c52e364c157dca8a54c60
+refs/heads/master: 1c9c73b7db1c74f0e9b8ea4755187d801f878651
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -135,7 +135,6 @@ struct dvb_usb_adapter_properties {
 	int (*fe_ioctl_override) (struct dvb_frontend *,
 			unsigned int, void *, unsigned int);
 
-	int num_frontends;
 	struct usb_data_stream_properties stream;
 };
 

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -186,7 +186,6 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 
 int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
 {
-	int i;
 	int ret = dvb_register_adapter(&adap->dvb_adap, adap->dev->name,
 				       adap->dev->props.owner,
 				       &adap->dev->udev->dev,
@@ -211,10 +210,8 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
 	adap->demux.priv             = adap;
 
 	adap->demux.filternum        = 0;
-	for (i = 0; i < adap->props.num_frontends; i++) {
-		if (adap->demux.filternum < adap->max_feed_count)
-			adap->demux.filternum = adap->max_feed_count;
-	}
+	if (adap->demux.filternum < adap->max_feed_count)
+		adap->demux.filternum = adap->max_feed_count;
 	adap->demux.feednum          = adap->demux.filternum;
 	adap->demux.start_feed       = dvb_usb_start_feed;
 	adap->demux.stop_feed        = dvb_usb_stop_feed;