---

yaml --- r: 330579 b: refs/heads/master c: 3024985 h: refs/heads/master i: 330577: b6a2846 330575: edda215 v: v3
git-mirror · Aug 4, 2012 · b95b2e8 · b95b2e8
1 parent 05d0353
commit b95b2e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6ecf8bb4e0fbda10f41770187e2120c282770f4
+refs/heads/master: 3024985d15bdf5e8a55468a35c86ed9fa8c3eec5
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -129,8 +129,6 @@ struct dvb_usb_adapter_fe_properties {
 	int (*frontend_attach) (struct dvb_usb_adapter *);
 	int (*tuner_attach)    (struct dvb_usb_adapter *);
 
-	struct usb_data_stream_properties stream;
-
 	int size_of_priv;
 };
 
@@ -144,6 +142,7 @@ struct dvb_usb_adapter_properties {
 
 	int num_frontends;
 	struct dvb_usb_adapter_fe_properties fe[MAX_NO_OF_FE_PER_ADAP];
+	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
@@ -47,7 +47,7 @@ int dvb_usb_adapter_stream_init(struct dvb_usb_adapter *adap)
 		if (ret < 0)
 			return ret;
 	} else {
-		stream_props = adap->props.fe[0].stream;
+		stream_props = adap->props.stream;
 	}
 
 	/* FIXME: can be removed as set later in anyway */
@@ -139,7 +139,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
 			if (ret < 0)
 				return ret;
 		} else {
-			stream_props = adap->props.fe[adap->active_fe].stream;
+			stream_props = adap->props.stream;
 		}
 
 		deb_ts("submitting all URBs\n");