---

yaml --- r: 306105 b: refs/heads/master c: 1083a0f h: refs/heads/master i: 306103: 3773122 v: v3
git-mirror · Apr 9, 2012 · df666c2 · df666c2
1 parent 39017ac
commit df666c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc501f654f566bf6a9e567f75c302d93f9e22e8
+refs/heads/master: 1083a0f9b8f622cefbd53fe75089c37728b6452f
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9035.c b/trunk/drivers/media/dvb/dvb-usb/af9035.c
@@ -738,11 +738,17 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
 
 enum af9035_id_entry {
 	AF9035_0CCD_0093,
+	AF9035_15A4_9035,
+	AF9035_15A4_1001,
 };
 
 static struct usb_device_id af9035_id[] = {
 	[AF9035_0CCD_0093] = {
 		USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK)},
+	[AF9035_15A4_9035] = {
+		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},
+	[AF9035_15A4_1001] = {
+		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},
 	{},
 };
 
@@ -785,14 +791,20 @@ static struct dvb_usb_device_properties af9035_properties[] = {
 
 		.i2c_algo = &af9035_i2c_algo,
 
-		.num_device_descs = 1,
+		.num_device_descs = 2,
 		.devices = {
 			{
 				.name = "TerraTec Cinergy T Stick",
 				.cold_ids = {
 					&af9035_id[AF9035_0CCD_0093],
 				},
-			},
+			}, {
+				.name = "Afatech Technologies DVB-T stick",
+				.cold_ids = {
+					&af9035_id[AF9035_15A4_9035],
+					&af9035_id[AF9035_15A4_1001],
+				},
+			}
 		}
 	},
 };

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -76,6 +76,8 @@
 #define USB_PID_AFATECH_AF9005				0x9020
 #define USB_PID_AFATECH_AF9015_9015			0x9015
 #define USB_PID_AFATECH_AF9015_9016			0x9016
+#define USB_PID_AFATECH_AF9035				0x9035
+#define USB_PID_AFATECH_AF9035_2			0x1001
 #define USB_PID_TREKSTOR_DVBT				0x901b
 #define USB_VID_ALINK_DTU				0xf170
 #define USB_PID_ANSONIC_DVBT_USB			0x6000