From 9770073e85c2459b5e3619f63681acca4ec1f353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nam=20Ph=E1=BA=A1m=20Th=C3=A0nh?=
 <phamthanhnam.ptn@gmail.com>
Date: Sun, 12 Jul 2009 11:51:10 -0300
Subject: [PATCH] --- yaml --- r: 161535 b: refs/heads/master c:
 ce212f052fa2fe1a5e71af13be63667e1916d084 h: refs/heads/master i:   161533:
 59089e74c839461c48e628d29b642e9e302a3d59   161531:
 5c0b3e80c24f2bd917ae963335308dbaacb29890   161527:
 47498c2d05d5204296928a30308afab7ea7a6d65   161519:
 3a60330e6490acf6e76901c281d5b4f266bb1dbb   161503:
 b7a51db48cab467b6af5635b4b927baa0b75488d   161471:
 c827f4ca8427879aad6594430ed2586a1ab3c8bc   161407:
 b7d802bfcaee934c6a9c2ce31027a00802368b6b   161279:
 db096d3979726fd6cfb31c40bfef731e2eab2318 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c   | 10 ++++++++--
 trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cbed7ff957c5..05c1fc031bfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c2ca352944e1899e72a39cc640d874dfa008a1b
+refs/heads/master: ce212f052fa2fe1a5e71af13be63667e1916d084
diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 059cec955318..a05b9f875663 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -42,6 +42,8 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
 /* 11 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,	USB_PID_ARTEC_T14_WARM) },
 /* 12 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_COLD) },
 /* 13 */	{ USB_DEVICE(USB_VID_LEADTEK,		USB_PID_WINFAST_DTV_DONGLE_WARM) },
+/* 14 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
+/* 15 */	{ USB_DEVICE(USB_VID_HUMAX_COEX,	USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
 			{ }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
@@ -66,7 +68,7 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
 	/* parameter for the MPEG2-data transfer */
 			.stream = {
 				.type = USB_BULK,
-				.count = 7,
+				.count = 8,
 				.endpoint = 0x06,
 				.u = {
 					.bulk = {
@@ -88,7 +90,7 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
 
 	.generic_bulk_ctrl_endpoint = 0x01,
 
-	.num_device_descs = 7,
+	.num_device_descs = 8,
 	.devices = {
 		{   "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
 			{ &dibusb_dib3000mc_table[0], NULL },
@@ -119,6 +121,10 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
 			{ &dibusb_dib3000mc_table[12], NULL },
 			{ &dibusb_dib3000mc_table[13], NULL },
 		},
+		{   "Humax/Coex DVB-T USB Stick 2.0 High Speed",
+			{ &dibusb_dib3000mc_table[14], NULL },
+			{ &dibusb_dib3000mc_table[15], NULL },
+		},
 		{ NULL },
 	}
 };
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 6eccce1a76f3..bf732016797b 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -58,6 +58,7 @@
 #define USB_VID_GIGABYTE			0x1044
 #define USB_VID_YUAN				0x1164
 #define USB_VID_XTENSIONS			0x1ae7
+#define USB_VID_HUMAX_COEX			0x10b9
 
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD			0xa333
@@ -260,5 +261,7 @@
 #define USB_PID_SONY_PLAYTV				0x0003
 #define USB_PID_ELGATO_EYETV_DTT			0x0021
 #define USB_PID_ELGATO_EYETV_DTT_Dlx			0x0020
+#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD		0x5000
+#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM		0x5001
 
 #endif