leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-05-29 16:12:17 -03:00 committed by Mauro Carvalho Chehab
parent b6ecf8bb4e
commit 3024985d15
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/dvb/dvb-usb/dvb_usb.h
View File

@ -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;
};
/**

4
drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
View File

@ -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");