]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (5142): M920x: move filter caps from device caps to adapter caps
authorMichael Krufky <mkrufky@linuxtv.org>
Tue, 23 Jan 2007 18:34:10 +0000 (15:34 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 21 Feb 2007 15:34:54 +0000 (13:34 -0200)
Move filter caps from device caps to adapter caps for the megasky driver.
This fixes usb1.1 operation.

Signed-off-by: Aapo Tahkola <aet@rasterburn.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/dvb-usb/m920x.c

index 816c7129ed989a40a6523ef7ce485a96fd670bab..d48b24d9abf456569c1b274d64a741a2099d4af2 100644 (file)
@@ -458,8 +458,7 @@ static struct usb_device_id m920x_table [] = {
 MODULE_DEVICE_TABLE (usb, m920x_table);
 
 static struct dvb_usb_device_properties megasky_properties = {
-       .caps = DVB_USB_IS_AN_I2C_ADAPTER | DVB_USB_ADAP_HAS_PID_FILTER |
-               DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+       .caps = DVB_USB_IS_AN_I2C_ADAPTER,
 
        .usb_ctrl = DEVICE_SPECIFIC,
        .firmware = "dvb-usb-megasky-02.fw",
@@ -475,6 +474,9 @@ static struct dvb_usb_device_properties megasky_properties = {
        .identify_state   = megasky_identify_state,
        .num_adapters = 1,
        .adapter = {{
+               .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                       DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
                .pid_filter_count = 8,
                .pid_filter       = m9206_pid_filter,
                .pid_filter_ctrl  = m9206_pid_filter_ctrl,