aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c9
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index cf042b309b46..ac21c1a8075e 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1283,6 +1283,7 @@ static struct usb_device_id af9015_usb_table[] = {
1283 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)}, 1283 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},
1284 {USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)}, 1284 {USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)},
1285/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)}, 1285/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},
1286 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},
1286 {0}, 1287 {0},
1287}; 1288};
1288MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1289MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1554,7 +1555,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1554 1555
1555 .i2c_algo = &af9015_i2c_algo, 1556 .i2c_algo = &af9015_i2c_algo,
1556 1557
1557 .num_device_descs = 4, /* max 9 */ 1558 .num_device_descs = 5, /* max 9 */
1558 .devices = { 1559 .devices = {
1559 { 1560 {
1560 .name = "AverMedia AVerTV Volar GPS 805 (A805)", 1561 .name = "AverMedia AVerTV Volar GPS 805 (A805)",
@@ -1577,6 +1578,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1577 .cold_ids = {&af9015_usb_table[24], NULL}, 1578 .cold_ids = {&af9015_usb_table[24], NULL},
1578 .warm_ids = {NULL}, 1579 .warm_ids = {NULL},
1579 }, 1580 },
1581 {
1582 .name = "KWorld PlusTV DVB-T PCI Pro Card " \
1583 "(DVB-T PC160-T)",
1584 .cold_ids = {&af9015_usb_table[26], NULL},
1585 .warm_ids = {NULL},
1586 },
1580 } 1587 }
1581 }, 1588 },
1582}; 1589};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index e852eac8cb5e..128fca63df95 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -116,6 +116,7 @@
116#define USB_PID_KWORLD_395U_3 0xe395 116#define USB_PID_KWORLD_395U_3 0xe395
117#define USB_PID_KWORLD_MC810 0xc810 117#define USB_PID_KWORLD_MC810 0xc810
118#define USB_PID_KWORLD_PC160_2T 0xc160 118#define USB_PID_KWORLD_PC160_2T 0xc160
119#define USB_PID_KWORLD_PC160_T 0xc161
119#define USB_PID_KWORLD_VSTREAM_COLD 0x17de 120#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
120#define USB_PID_KWORLD_VSTREAM_WARM 0x17df 121#define USB_PID_KWORLD_VSTREAM_WARM 0x17df
121#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055 122#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055