[PATCH] dvb: usb: dibusb: Kworld Xpert DVB-T USB2.0 support

Add USB IDs of the Kworld Xpert DVB-T USB2.0 (clone of the ADStech box).
Thanks to Marcus Hagn for testing.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 828b5182e16c..c9f3e90ee25f 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -126,10 +126,12 @@ static struct usb_device_id dibusb_dib3000mb_table [] = {
 /* 25 */        { USB_DEVICE(USB_VID_KYE,                       USB_PID_KYE_DVB_T_COLD) },
 /* 26 */        { USB_DEVICE(USB_VID_KYE,                       USB_PID_KYE_DVB_T_WARM) },
 
+/* 27 */        { USB_DEVICE(USB_VID_KWORLD,            USB_PID_KWORLD_VSTREAM_COLD) },
+
 // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
 
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
-/* 27 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+/* 28 */        { USB_DEVICE(USB_VID_ANCHOR,            USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
 #endif
                         { }             /* Terminating entry */
 };
@@ -262,7 +264,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
                 },
 #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs
                 {       "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",
-                        { &dibusb_dib3000mb_table[27], NULL },
+                        { &dibusb_dib3000mb_table[28], NULL },
                         { NULL },
                 },
 #endif
@@ -306,12 +308,16 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
                 }
         },
 
-        .num_device_descs = 1,
+        .num_device_descs = 2,
         .devices = {
-                {       "KWorld/ADSTech Instant DVB-T USB 2.0",
+                {       "KWorld/ADSTech Instant DVB-T USB2.0",
                         { &dibusb_dib3000mb_table[23], NULL },
                         { &dibusb_dib3000mb_table[24], NULL },
                 },
+                {       "KWorld Xpert DVB-T USB2.0",
+                        { &dibusb_dib3000mb_table[27], NULL },
+                        { NULL }
+                },
         }
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2b249c75fb02..1b978389e4ec 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -24,6 +24,7 @@
 #define USB_VID_HANFTEK                                         0x15f4
 #define USB_VID_HAUPPAUGE                                       0x2040
 #define USB_VID_HYPER_PALTEK                            0x1025
+#define USB_VID_KWORLD                                          0xeb2a
 #define USB_VID_KYE                                                     0x0458
 #define USB_VID_MEDION                                          0x1660
 #define USB_VID_VISIONPLUS                                      0x13d3