aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-01-23 13:34:10 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:54 -0500
commit758117c25b65ed5fa502c13f3cdf040a8f954161 (patch)
treed1a6ad2fc76484bb49a15401019f891953b18dec
parente16c1f55642d79a80c45ace7603b284975559e78 (diff)
V4L/DVB (5142): M920x: move filter caps from device caps to adapter caps
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>
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 816c7129ed98..d48b24d9abf4 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -458,8 +458,7 @@ static struct usb_device_id m920x_table [] = {
458MODULE_DEVICE_TABLE (usb, m920x_table); 458MODULE_DEVICE_TABLE (usb, m920x_table);
459 459
460static struct dvb_usb_device_properties megasky_properties = { 460static struct dvb_usb_device_properties megasky_properties = {
461 .caps = DVB_USB_IS_AN_I2C_ADAPTER | DVB_USB_ADAP_HAS_PID_FILTER | 461 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
462 DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
463 462
464 .usb_ctrl = DEVICE_SPECIFIC, 463 .usb_ctrl = DEVICE_SPECIFIC,
465 .firmware = "dvb-usb-megasky-02.fw", 464 .firmware = "dvb-usb-megasky-02.fw",
@@ -475,6 +474,9 @@ static struct dvb_usb_device_properties megasky_properties = {
475 .identify_state = megasky_identify_state, 474 .identify_state = megasky_identify_state,
476 .num_adapters = 1, 475 .num_adapters = 1,
477 .adapter = {{ 476 .adapter = {{
477 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
478 DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
479
478 .pid_filter_count = 8, 480 .pid_filter_count = 8,
479 .pid_filter = m9206_pid_filter, 481 .pid_filter = m9206_pid_filter,
480 .pid_filter_ctrl = m9206_pid_filter_ctrl, 482 .pid_filter_ctrl = m9206_pid_filter_ctrl,