summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierangelo Terzulli <pierigno@gmail.com>2012-04-06 04:26:18 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-09 21:55:59 +0400
commitdbac01ffbb8619591ee2980eb093f086a5ba1848 (patch)
tree7d6e9c3f88598122c7d05e40d68fa046fd765ebe
parentde7f14fcad50ccf66514498fd3bfaac015b071a5 (diff)
downloadlinux-dbac01ffbb8619591ee2980eb093f086a5ba1848.tar.xz
[media] af9035: add AVerMedia Twinstar (A825) [07ca:0825]
[crope@iki.fi: applied manually since erroneous patch] Signed-off-by: Pierangelo Terzulli <pierigno@gmail.com> 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/af9035.c10
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c
index 5ae5cc167c9f..9503b2d440e6 100644
--- a/drivers/media/dvb/dvb-usb/af9035.c
+++ b/drivers/media/dvb/dvb-usb/af9035.c
@@ -923,6 +923,7 @@ enum af9035_id_entry {
AF9035_07CA_B835,
AF9035_07CA_1867,
AF9035_07CA_A867,
+ AF9035_07CA_0825,
};
static struct usb_device_id af9035_id[] = {
@@ -940,6 +941,8 @@ static struct usb_device_id af9035_id[] = {
USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_1867)},
[AF9035_07CA_A867] = {
USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A867)},
+ [AF9035_07CA_0825] = {
+ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_TWINSTAR)},
{},
};
@@ -982,7 +985,7 @@ static struct dvb_usb_device_properties af9035_properties[] = {
.i2c_algo = &af9035_i2c_algo,
- .num_device_descs = 4,
+ .num_device_descs = 5,
.devices = {
{
.name = "TerraTec Cinergy T Stick",
@@ -1007,6 +1010,11 @@ static struct dvb_usb_device_properties af9035_properties[] = {
&af9035_id[AF9035_07CA_1867],
&af9035_id[AF9035_07CA_A867],
},
+ }, {
+ .name = "AVerMedia Twinstar (A825)",
+ .cold_ids = {
+ &af9035_id[AF9035_07CA_0825],
+ },
},
}
},
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 6a761c546a98..94d3f8a5cd9e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -228,6 +228,7 @@
#define USB_PID_AVERMEDIA_B835 0xb835
#define USB_PID_AVERMEDIA_1867 0x1867
#define USB_PID_AVERMEDIA_A867 0xa867
+#define USB_PID_AVERMEDIA_TWINSTAR 0x0825
#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006
#define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d
#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a