diff options
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 16 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 10 |
2 files changed, 17 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 5ebfa3f08546..43f39069ef34 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -505,14 +505,16 @@ static struct usb_device_id cxusb_table [] = { | |||
505 | { USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700) }, | 505 | { USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700) }, |
506 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD) }, | 506 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD) }, |
507 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM) }, | 507 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM) }, |
508 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DEE1601_COLD) }, | 508 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD) }, |
509 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DEE1601_WARM) }, | 509 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM) }, |
510 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD) }, | 510 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD) }, |
511 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) }, | 511 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) }, |
512 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) }, | 512 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) }, |
513 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) }, | 513 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) }, |
514 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD) }, | 514 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD) }, |
515 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM) }, | 515 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) }, |
516 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) }, | ||
517 | { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) }, | ||
516 | {} /* Terminating entry */ | 518 | {} /* Terminating entry */ |
517 | }; | 519 | }; |
518 | MODULE_DEVICE_TABLE (usb, cxusb_table); | 520 | MODULE_DEVICE_TABLE (usb, cxusb_table); |
@@ -653,7 +655,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = { | |||
653 | 655 | ||
654 | .generic_bulk_ctrl_endpoint = 0x01, | 656 | .generic_bulk_ctrl_endpoint = 0x01, |
655 | 657 | ||
656 | .num_device_descs = 2, | 658 | .num_device_descs = 3, |
657 | .devices = { | 659 | .devices = { |
658 | { "DViCO FusionHDTV DVB-T Dual USB", | 660 | { "DViCO FusionHDTV DVB-T Dual USB", |
659 | { &cxusb_table[3], NULL }, | 661 | { &cxusb_table[3], NULL }, |
@@ -663,6 +665,10 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = { | |||
663 | { &cxusb_table[9], NULL }, | 665 | { &cxusb_table[9], NULL }, |
664 | { &cxusb_table[10], NULL }, | 666 | { &cxusb_table[10], NULL }, |
665 | }, | 667 | }, |
668 | { "DViCO FusionHDTV DVB-T Dual Digital 2", | ||
669 | { &cxusb_table[11], NULL }, | ||
670 | { &cxusb_table[12], NULL }, | ||
671 | }, | ||
666 | } | 672 | } |
667 | }; | 673 | }; |
668 | 674 | ||
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 35bd92803730..4d6b069536ce 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -106,10 +106,12 @@ | |||
106 | #define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM 0xdb01 | 106 | #define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM 0xdb01 |
107 | #define USB_PID_DVICO_BLUEBIRD_TH7579_COLD 0xdb10 | 107 | #define USB_PID_DVICO_BLUEBIRD_TH7579_COLD 0xdb10 |
108 | #define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11 | 108 | #define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11 |
109 | #define USB_PID_DVICO_BLUEBIRD_DEE1601_COLD 0xdb50 | 109 | #define USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD 0xdb50 |
110 | #define USB_PID_DVICO_BLUEBIRD_DEE1601_WARM 0xdb51 | 110 | #define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM 0xdb51 |
111 | #define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD 0xdb54 | 111 | #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD 0xdb58 |
112 | #define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM 0xdb55 | 112 | #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM 0xdb59 |
113 | #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54 | ||
114 | #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55 | ||
113 | #define USB_PID_MEDION_MD95700 0x0932 | 115 | #define USB_PID_MEDION_MD95700 0x0932 |
114 | #define USB_PID_KYE_DVB_T_COLD 0x701e | 116 | #define USB_PID_KYE_DVB_T_COLD 0x701e |
115 | #define USB_PID_KYE_DVB_T_WARM 0x701f | 117 | #define USB_PID_KYE_DVB_T_WARM 0x701f |