Bläddra i källkod

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>
Michael Krufky 19 år sedan
förälder
incheckning
1f61f3bab3
1 ändrade filer med 3 tillägg och 3 borttagningar
  1. 3 3
      drivers/media/dvb/dvb-usb/m920x.c

+ 3 - 3
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,