Commit 3024985d authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: move (struct usb_data_stream_properties) to upper level 



Move USB stream properties from frontend to adapter.
It is property of adapter.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b6ecf8bb

drivers/media/dvb/dvb-usb/dvb_usb.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

};



/**

drivers/media/dvb/dvb-usb/dvb_usb_dvb.c

+2 −2
Original line number Diff line number Diff line
@@ -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");