1 files changed, 23 insertions, 8 deletions

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 8ddbadf62194..818b2ab584bf 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1346,9 +1346,9 @@ static int dib0700_xc5000_tuner_callback(void *priv, int component,
         if (command == XC5000_TUNER_RESET) {
                 /* Reset the tuner */
                 dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 0);
-                msleep(330); /* from Windows USB trace */
+                msleep(10);
                 dib0700_set_gpio(adap->dev, GPIO1, GPIO_OUT, 1);
-                msleep(330); /* from Windows USB trace */
+                msleep(10);
         } else {
                 err("xc5000: unknown tuner callback command: %d\n", command);
                 return -EINVAL;
@@ -1493,6 +1493,10 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_TIGER_ATSC_B210) },
         { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_MC770) },
         { USB_DEVICE(USB_VID_ELGATO,    USB_PID_ELGATO_EYETV_DTT) },
+/* 50 */{ USB_DEVICE(USB_VID_ELGATO,    USB_PID_ELGATO_EYETV_DTT_Dlx) },
+        { USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_H) },
+        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T3) },
+        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T5) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1692,7 +1696,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         },
                 },
 
-                .num_device_descs = 11,
+                .num_device_descs = 12,
                 .devices = {
                         {   "DiBcom STK7070P reference design",
                                 { &dib0700_usb_id_table[15], NULL },
@@ -1726,8 +1730,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[30], NULL },
                                 { NULL },
                         },
-                        {   "Terratec Cinergy T USB XXS",
-                                { &dib0700_usb_id_table[33], NULL },
+                        {   "Terratec Cinergy T USB XXS/ T3",
+                                { &dib0700_usb_id_table[33],
+                                        &dib0700_usb_id_table[52], NULL },
                                 { NULL },
                         },
                         {   "Elgato EyeTV DTT",
@@ -1738,6 +1743,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[45], NULL },
                                 { NULL },
                         },
+                        {   "Elgato EyeTV Dtt Dlx PD378S",
+                                { &dib0700_usb_id_table[50], NULL },
+                                { NULL },
+                        },
                 },
 
                 .rc_interval      = DEFAULT_RC_INTERVAL,
@@ -1784,8 +1793,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[36], NULL },
                                 { NULL },
                         },
-                        {  "Terratec Cinergy DT USB XS Diversity",
-                                { &dib0700_usb_id_table[43], NULL },
+                        {  "Terratec Cinergy DT USB XS Diversity/ T5",
+                                { &dib0700_usb_id_table[43],
+                                        &dib0700_usb_id_table[53], NULL},
                                 { NULL },
                         },
                         {  "Sony PlayTV",
@@ -1812,7 +1822,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         },
                 },
 
-                .num_device_descs = 7,
+                .num_device_descs = 8,
                 .devices = {
                         {   "Terratec Cinergy HT USB XE",
                                 { &dib0700_usb_id_table[27], NULL },
@@ -1842,6 +1852,11 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                 { &dib0700_usb_id_table[48], NULL },
                                 { NULL },
                         },
+                        {   "Leadtek WinFast DTV Dongle H",
+                                { &dib0700_usb_id_table[51], NULL },
+                                { NULL },
+                        },
+
                 },
                 .rc_interval      = DEFAULT_RC_INTERVAL,
                 .rc_key_map       = dib0700_rc_keys,