From ac7d5ecdc55fe43ce28e2da069b62efed9142211 Mon Sep 17 00:00:00 2001 From: Christoph Nuscheler Date: Sat, 9 Feb 2013 15:56:23 -0300 Subject: [PATCH] --- yaml --- r: 357565 b: refs/heads/master c: ed72d37a33fdf43dc47787fe220532cdec9da528 h: refs/heads/master i: 357563: f17ed08594a839b635ebf92b19675288cb8d228b v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb-core/dvb-usb-ids.h | 1 + trunk/drivers/media/usb/dvb-usb/ttusb2.c | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a087e13882cb..4df2eaa8aeb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e2afff1e6b36d05a0e12b6114eb0aaf8949c09 +refs/heads/master: ed72d37a33fdf43dc47787fe220532cdec9da528 diff --git a/trunk/drivers/media/dvb-core/dvb-usb-ids.h b/trunk/drivers/media/dvb-core/dvb-usb-ids.h index 7e1597dad568..399e1042d351 100644 --- a/trunk/drivers/media/dvb-core/dvb-usb-ids.h +++ b/trunk/drivers/media/dvb-core/dvb-usb-ids.h @@ -242,6 +242,7 @@ #define USB_PID_AVERMEDIA_A867 0xa867 #define USB_PID_AVERMEDIA_TWINSTAR 0x0825 #define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006 +#define USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM 0x3009 #define USB_PID_TECHNOTREND_CONNECT_CT3650 0x300d #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081 diff --git a/trunk/drivers/media/usb/dvb-usb/ttusb2.c b/trunk/drivers/media/usb/dvb-usb/ttusb2.c index bcdac225ebe1..2ce3d19c58ef 100644 --- a/trunk/drivers/media/usb/dvb-usb/ttusb2.c +++ b/trunk/drivers/media/usb/dvb-usb/ttusb2.c @@ -620,6 +620,8 @@ static struct usb_device_id ttusb2_table [] = { USB_PID_TECHNOTREND_CONNECT_S2400) }, { USB_DEVICE(USB_VID_TECHNOTREND, USB_PID_TECHNOTREND_CONNECT_CT3650) }, + { USB_DEVICE(USB_VID_TECHNOTREND, + USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM) }, {} /* Terminating entry */ }; MODULE_DEVICE_TABLE (usb, ttusb2_table); @@ -721,12 +723,16 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = { .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 1, + .num_device_descs = 2, .devices = { { "Technotrend TT-connect S-2400", { &ttusb2_table[2], NULL }, { NULL }, }, + { "Technotrend TT-connect S-2400 (8kB EEPROM)", + { &ttusb2_table[4], NULL }, + { NULL }, + }, } };