aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2009-03-26 19:41:05 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:43:53 -0400
commit58fe1595455566a1cfe22db6f5f59bc989e5a80f (patch)
tree61328d7b391e17e9ae4e2f7526ce62d5d5918de0
parent34013e2de3bf752114915509879380f8394fca5a (diff)
V4L/DVB (11337): af9015: add new USB ID for KWorld USB DVB-T TV Stick II (VS-DVB-T 395U)
Add new USB ID (1b80:e395) for KWorld USB DVB-T TV Stick II (VS-DVB-T 395U). Thanks to Julian Aron Prenner <julian@linux4you.it> for reporting this. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c4
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index f0ba8b07b84f..1086f30e8880 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1237,6 +1237,7 @@ static struct usb_device_id af9015_usb_table[] = {
1237/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)}, 1237/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},
1238 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)}, 1238 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)},
1239 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_2)}, 1239 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_2)},
1240 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_3)},
1240 {0}, 1241 {0},
1241}; 1242};
1242MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1243MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1437,7 +1438,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1437 .name = "KWorld USB DVB-T TV Stick II " \ 1438 .name = "KWorld USB DVB-T TV Stick II " \
1438 "(VS-DVB-T 395U)", 1439 "(VS-DVB-T 395U)",
1439 .cold_ids = {&af9015_usb_table[16], 1440 .cold_ids = {&af9015_usb_table[16],
1440 &af9015_usb_table[17], NULL}, 1441 &af9015_usb_table[17],
1442 &af9015_usb_table[18], NULL},
1441 .warm_ids = {NULL}, 1443 .warm_ids = {NULL},
1442 }, 1444 },
1443 } 1445 }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index ffe2a7335bee..75dc4b79fa24 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -102,6 +102,7 @@
102#define USB_PID_KWORLD_399U 0xe399 102#define USB_PID_KWORLD_399U 0xe399
103#define USB_PID_KWORLD_395U 0xe396 103#define USB_PID_KWORLD_395U 0xe396
104#define USB_PID_KWORLD_395U_2 0xe39b 104#define USB_PID_KWORLD_395U_2 0xe39b
105#define USB_PID_KWORLD_395U_3 0xe395
105#define USB_PID_KWORLD_PC160_2T 0xc160 106#define USB_PID_KWORLD_PC160_2T 0xc160
106#define USB_PID_KWORLD_VSTREAM_COLD 0x17de 107#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
107#define USB_PID_KWORLD_VSTREAM_WARM 0x17df 108#define USB_PID_KWORLD_VSTREAM_WARM 0x17df