aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c8
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 965d7bd1b76c..06d54b005945 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1264,6 +1264,7 @@ static struct usb_device_id af9015_usb_table[] = {
1264/* 20 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)}, 1264/* 20 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850)},
1265 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)}, 1265 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A805)},
1266 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)}, 1266 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CONCEPTRONIC_CTVDIGRCU)},
1267 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},
1267 {0}, 1268 {0},
1268}; 1269};
1269MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1270MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1534,7 +1535,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1534 1535
1535 .i2c_algo = &af9015_i2c_algo, 1536 .i2c_algo = &af9015_i2c_algo,
1536 1537
1537 .num_device_descs = 2, /* max 9 */ 1538 .num_device_descs = 3, /* max 9 */
1538 .devices = { 1539 .devices = {
1539 { 1540 {
1540 .name = "AverMedia AVerTV Volar GPS 805 (A805)", 1541 .name = "AverMedia AVerTV Volar GPS 805 (A805)",
@@ -1547,6 +1548,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1547 .cold_ids = {&af9015_usb_table[22], NULL}, 1548 .cold_ids = {&af9015_usb_table[22], NULL},
1548 .warm_ids = {NULL}, 1549 .warm_ids = {NULL},
1549 }, 1550 },
1551 {
1552 .name = "KWorld Digial MC-810",
1553 .cold_ids = {&af9015_usb_table[23], NULL},
1554 .warm_ids = {NULL},
1555 },
1550 } 1556 }
1551 }, 1557 },
1552}; 1558};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 6a4062d5d0af..1b5e65f1ddaa 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -105,6 +105,7 @@
105#define USB_PID_KWORLD_395U 0xe396 105#define USB_PID_KWORLD_395U 0xe396
106#define USB_PID_KWORLD_395U_2 0xe39b 106#define USB_PID_KWORLD_395U_2 0xe39b
107#define USB_PID_KWORLD_395U_3 0xe395 107#define USB_PID_KWORLD_395U_3 0xe395
108#define USB_PID_KWORLD_MC810 0xc810
108#define USB_PID_KWORLD_PC160_2T 0xc160 109#define USB_PID_KWORLD_PC160_2T 0xc160
109#define USB_PID_KWORLD_VSTREAM_COLD 0x17de 110#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
110#define USB_PID_KWORLD_VSTREAM_WARM 0x17df 111#define USB_PID_KWORLD_VSTREAM_WARM 0x17df