current revision of the Cinergy S2 USB box from Terratec seems to use
another USB-IDs. The manufacturer provides patches at
http://linux.terratec.de/tv_en.html and it seems like the only
difference is really just the new ID and a couple of init flag changes.
Their patch is not exactly for the linux-3.x tree but for the current
s2-liplianin drivers, OTOH they still look similar enough and porting
the patch was straight-forward. I also added the patch for Terratec S7
which is not tested yet but shouldn't do any harm.