summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-10-07 15:03:04 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:52 -0200
commit1f61f3bab303c02cfd822c952284a381089452a0 (patch)
treee259880d2e13840de03b387916bf6005c77129ae
parent565ef12713c5620b6f802d67861153a3f68499a4 (diff)
downloadop-kernel-dev-1f61f3bab303c02cfd822c952284a381089452a0.zip
op-kernel-dev-1f61f3bab303c02cfd822c952284a381089452a0.tar.gz
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>
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 4e67a19..d47245e 100644
--- 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,
OpenPOWER on IntegriCloud