---

yaml --- r: 306117 b: refs/heads/master c: dbac01f h: refs/heads/master i: 306115: dc942a5 v: v3
git-mirror · Apr 9, 2012 · 2cf58dd · 2cf58dd
1 parent cb59250
commit 2cf58dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de7f14fcad50ccf66514498fd3bfaac015b071a5
+refs/heads/master: dbac01ffbb8619591ee2980eb093f086a5ba1848
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9035.c b/trunk/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/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/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