|
@@ -38,41 +38,41 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
|
|
|
|
|
|
memcpy(&adap->props, &d->props.adapter[n], sizeof(struct dvb_usb_adapter_properties));
|
|
|
|
|
|
- for (o = 0; o < adap->props.num_frontends; o++) {
|
|
|
- struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
|
|
|
- /* speed - when running at FULL speed we need a HW PID filter */
|
|
|
- if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
|
|
|
- err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
+ for (o = 0; o < adap->props.num_frontends; o++) {
|
|
|
+ struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
|
|
|
+ /* speed - when running at FULL speed we need a HW PID filter */
|
|
|
+ if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
|
|
|
+ err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
|
|
|
+ return -ENODEV;
|
|
|
+ }
|
|
|
|
|
|
- if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
|
|
|
- (props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
|
|
|
- info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
|
|
|
- adap->fe_adap[o].pid_filtering = 1;
|
|
|
- adap->fe_adap[o].max_feed_count = props->pid_filter_count;
|
|
|
- } else {
|
|
|
- info("will pass the complete MPEG2 transport stream to the software demuxer.");
|
|
|
- adap->fe_adap[o].pid_filtering = 0;
|
|
|
- adap->fe_adap[o].max_feed_count = 255;
|
|
|
- }
|
|
|
+ if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
|
|
|
+ (props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
|
|
|
+ info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
|
|
|
+ adap->fe_adap[o].pid_filtering = 1;
|
|
|
+ adap->fe_adap[o].max_feed_count = props->pid_filter_count;
|
|
|
+ } else {
|
|
|
+ info("will pass the complete MPEG2 transport stream to the software demuxer.");
|
|
|
+ adap->fe_adap[o].pid_filtering = 0;
|
|
|
+ adap->fe_adap[o].max_feed_count = 255;
|
|
|
+ }
|
|
|
|
|
|
- if (!adap->fe_adap[o].pid_filtering &&
|
|
|
- dvb_usb_force_pid_filter_usage &&
|
|
|
- props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
|
|
|
- info("pid filter enabled by module option.");
|
|
|
- adap->fe_adap[o].pid_filtering = 1;
|
|
|
- adap->fe_adap[o].max_feed_count = props->pid_filter_count;
|
|
|
- }
|
|
|
+ if (!adap->fe_adap[o].pid_filtering &&
|
|
|
+ dvb_usb_force_pid_filter_usage &&
|
|
|
+ props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
|
|
|
+ info("pid filter enabled by module option.");
|
|
|
+ adap->fe_adap[o].pid_filtering = 1;
|
|
|
+ adap->fe_adap[o].max_feed_count = props->pid_filter_count;
|
|
|
+ }
|
|
|
|
|
|
- if (props->size_of_priv > 0) {
|
|
|
- adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
|
|
|
- if (adap->fe_adap[o].priv == NULL) {
|
|
|
- err("no memory for priv for adapter %d fe %d.", n, o);
|
|
|
- return -ENOMEM;
|
|
|
+ if (props->size_of_priv > 0) {
|
|
|
+ adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
|
|
|
+ if (adap->fe_adap[o].priv == NULL) {
|
|
|
+ err("no memory for priv for adapter %d fe %d.", n, o);
|
|
|
+ return -ENOMEM;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
if (adap->props.size_of_priv > 0) {
|
|
|
adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);
|