diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-10-07 14:03:04 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-10-07 14:03:04 -0400 |
| commit | 2198c7842c8114359ee495795d1fc624d8514321 (patch) | |
| tree | ff6cae98c6a4e10972f94e084f84fe8aee671a80 /linux/drivers/media/dvb/dvb-usb | |
| parent | 47b47d371e02c3585268e06325bf27bc3ec27dcc (diff) | |
| download | mediapointer-dvb-s2-2198c7842c8114359ee495795d1fc624d8514321.tar.gz mediapointer-dvb-s2-2198c7842c8114359ee495795d1fc624d8514321.tar.bz2 | |
m920x: correct oops when loading module
From: Michael Krufky <mkrufky@linuxtv.org>
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>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/m920x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/m920x.c b/linux/drivers/media/dvb/dvb-usb/m920x.c index e44b52414..911570387 100644 --- a/linux/drivers/media/dvb/dvb-usb/m920x.c +++ b/linux/drivers/media/dvb/dvb-usb/m920x.c @@ -427,6 +427,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, @@ -441,9 +444,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, |