Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / dvb / dvb-usb / af9005.c

diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
index 0351c0e..bd51a76 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9005.c
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -815,7 +815,7 @@ static int af9005_frontend_attach(struct dvb_usb_adapter *adap)
                        debug_dump(buf, 8, printk);
                }
        }
-       adap->fe = af9005_fe_attach(adap->dev);
+       adap->fe_adap[0].fe = af9005_fe_attach(adap->dev);
        return 0;
 }
 
@@ -999,6 +999,8 @@ static struct dvb_usb_device_properties af9005_properties = {
        .num_adapters = 1,
        .adapter = {
                    {
+                   .num_frontends = 1,
+                   .fe = {{
                     .caps =
                     DVB_USB_ADAP_HAS_PID_FILTER |
                     DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
@@ -1018,6 +1020,7 @@ static struct dvb_usb_device_properties af9005_properties = {
                                               }
                                      }
                                },
+                    }},
                     }
                    },
        .power_ctrl = af9005_power_ctrl,