V4L/DVB (5136): M920x: correct oops when loading module

move .caps from the adapter properties to the device properties.
Thanks to Martin Schwier for confirming this fix.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 4e67a19042746d2dc0d217eaf717fb0aac4a1c37..d47245e9fe7ee0e42144ae8ab1ec590b0c2a51a7 100644 (file)
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -420,6 +420,9 @@ 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,
+
        .usb_ctrl = DEVICE_SPECIFIC,
        .firmware = "dvb-usb-megasky-02.fw",
        .download_firmware = m9206_firmware_download,
@@ -434,9 +437,6 @@ static struct dvb_usb_device_properties megasky_properties = {
        .identify_state   = megasky_identify_state,
        .num_adapters = 1,
        .adapter = {{
-               .caps = DVB_USB_IS_AN_I2C_ADAPTER | 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,