1 files changed, 25 insertions, 14 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index f9af3484834f..169196ec2d4e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -29,7 +29,7 @@ MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID
 static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
 {
         struct dvb_usb_adapter *adap;
-        int ret, n;
+        int ret, n, o;
 
         for (n = 0; n < d->props.num_adapters; n++) {
                 adap = &d->adapter[n];
@@ -38,31 +38,42 @@ 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 && !(adap->props.caps & DVB_USB_ADAP_HAS_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 && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
-                        (adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
-                        info("will use the device's hardware PID filter (table count: %d).", adap->props.pid_filter_count);
-                        adap->pid_filtering  = 1;
-                        adap->max_feed_count = adap->props.pid_filter_count;
+                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->pid_filtering  = 0;
-                        adap->max_feed_count = 255;
+                        adap->fe_adap[o].pid_filtering  = 0;
+                        adap->fe_adap[o].max_feed_count = 255;
                 }
 
-                if (!adap->pid_filtering &&
+                if (!adap->fe_adap[o].pid_filtering &&
                         dvb_usb_force_pid_filter_usage &&
-                        adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) {
+                        props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
                         info("pid filter enabled by module option.");
-                        adap->pid_filtering  = 1;
-                        adap->max_feed_count = adap->props.pid_filter_count;
+                        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 (adap->props.size_of_priv > 0) {
                         adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);
                         if (adap->priv == NULL) {
@@ -78,7 +89,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
                 }
 
                 /* use exclusive FE lock if there is multiple shared FEs */
-                if (adap->fe[1])
+                if (adap->fe_adap[1].fe)
                         adap->dvb_adap.mfe_shared = 1;
 
                 d->num_adapters_initialized++;