# HG changeset patch # User Igor M. Liplianin # Date 1225921198 -7200 # Node ID bae1cd16f0775768eb116ca3d08c2de525e850a5 # Parent 5e55fd741b9043534aec7bdf29b65cc6987d53a9 Add TerraTec Cinergy S USB support From: Igor M. Liplianin Add TerraTec Cinergy S USB support Signed-off-by: Igor M. Liplianin Acked-by : Thorsten Leupold diff -r 5e55fd741b90 -r bae1cd16f077 linux/drivers/media/dvb/dvb-usb/dw2102.c --- a/linux/drivers/media/dvb/dvb-usb/dw2102.c Wed Nov 05 13:15:29 2008 +0000 +++ b/linux/drivers/media/dvb/dvb-usb/dw2102.c Wed Nov 05 23:39:58 2008 +0200 @@ -24,6 +24,10 @@ #ifndef USB_PID_DW2104 #define USB_PID_DW2104 0x2104 +#endif + +#ifndef USB_PID_CINERGY_S +#define USB_PID_CINERGY_S 0x0064 #endif #define DW210X_READ_MSG 0 @@ -577,6 +581,7 @@ {USB_DEVICE(USB_VID_CYPRESS, 0x2101)}, {USB_DEVICE(USB_VID_CYPRESS, 0x2104)}, {USB_DEVICE(0x9022, 0xd650)}, + {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)}, { } }; @@ -646,6 +651,7 @@ dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, DW210X_WRITE_MSG); break; + case USB_PID_CINERGY_S: case USB_PID_DW2102: dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, DW210X_WRITE_MSG); @@ -725,7 +731,7 @@ }, } }, - .num_device_descs = 2, + .num_device_descs = 3, .devices = { {"DVBWorld DVB-S 2102 USB2.0", {&dw2102_table[0], NULL}, @@ -733,6 +739,10 @@ }, {"DVBWorld DVB-S 2101 USB2.0", {&dw2102_table[1], NULL}, + {NULL}, + }, + {"TerraTec Cinergy S USB", + {&dw2102_table[4], NULL}, {NULL}, }, }