V4L/DVB (12584): Support for Kaiser Baas ExpressCard Dual HD Tuner

The card is reported as YUAN High-Tech Development Co., Ltd STK7700D

[mchehab@redhat.com: fix merge conflicts and properly name USB PID]
Cc: Patrick Boettcher <patrick.boettcher@desy.de>
Signed-off-by: James A Webb <jamesawebb@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index efbba7029a0566f9a3dbc93ff188347a5b645120..7b0263f89de737054dd35202a6ee48d9e317c479 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1498,6 +1498,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T3) },
        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_T5) },
        { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D) },
+       { USB_DEVICE(USB_VID_YUAN,      USB_PID_YUAN_STK7700D_2) },
        { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1625,7 +1626,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                        }
                },
 
-               .num_device_descs = 4,
+               .num_device_descs = 5,
                .devices = {
                        {   "Pinnacle PCTV 2000e",
                                { &dib0700_usb_id_table[11], NULL },
@@ -1643,6 +1644,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                { &dib0700_usb_id_table[14], NULL },
                                { NULL },
                        },
+                       {   "YUAN High-Tech DiBcom STK7700D",
+                               { &dib0700_usb_id_table[55], 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 3324a73d5d890d5f3cd828cf80424c8e1f013def..185a5069b10bdb26ebf1628ebb095bdd9d425468 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -255,6 +255,7 @@
 #define USB_PID_YUAN_PD378S                            0x2edc
 #define USB_PID_YUAN_MC770                             0x0871
 #define USB_PID_YUAN_STK7700D                          0x1efc
+#define USB_PID_YUAN_STK7700D_2                                0x1e8c
 #define USB_PID_DW2102                                 0x2102
 #define USB_PID_XTENSIONS_XD_380                       0x0381
 #define USB_PID_TELESTAR_STARSTICK_2                   0x8000