From patchwork Tue May 8 16:28:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor M. Liplianin" X-Patchwork-Id: 11110 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SRnHJ-0006Cf-Ke for patchwork@linuxtv.org; Tue, 08 May 2012 18:28:45 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SRnHI-0002ho-FW; Tue, 08 May 2012 18:28:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755590Ab2EHQ2m (ORCPT ); Tue, 8 May 2012 12:28:42 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:51689 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755223Ab2EHQ2l (ORCPT ); Tue, 8 May 2012 12:28:41 -0400 Received: by bkcji2 with SMTP id ji2so4793758bkc.19 for ; Tue, 08 May 2012 09:28:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=bQooBeWkd5f4eqH6J16IMp5a7A/5cqTMVKRxd5l+3iM=; b=atBPUyyaZgGMG6RNxvCvXwYZfEu9NmBV3tounnKwkXktrehFAFSsYDpCzwBXAQ4rvm ZUMZ9ya3S5ECVxluZQLip88PZHZSzx2ht0bqD3/nU9oGi4OUcYA6Q1r4H9VE4+yv6SDk XwpnL/BAbM5WD1AD3ontpP+87u8w0889mpXbOgk5ZZ5HK3kk9Kl+EmXUanAuGmIXvziD ANsIn51ZMLVxhZ16tLMAFQssq52YnxFkyvcsxITjmEI3vAp6hdTBtH6bGaJJk7mo46oT mj5qLUVncBxo6OjNcq8We4gzN6Wgw+IpyA26pP+E2akt36QZ3BOuO+yJ31rmIUolo6fV vqeA== Received: by 10.204.156.155 with SMTP id x27mr7261684bkw.84.1336494520387; Tue, 08 May 2012 09:28:40 -0700 (PDT) Received: from useri.localnet ([93.125.112.3]) by mx.google.com with ESMTPS id u8sm40101255bks.0.2012.05.08.09.28.37 (version=SSLv3 cipher=OTHER); Tue, 08 May 2012 09:28:38 -0700 (PDT) From: "Igor M. Liplianin" To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab Subject: Terratec Cinergy S2 USB HD Rev.2 Date: Tue, 08 May 2012 19:28:47 +0300 Message-ID: <4473281.HKDuWdYvZs@useri> User-Agent: KMail/4.8.2 (Linux/3.3.4; KDE/4.8.2; x86_64; ; ) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmQpUtVyBaerSxkt6Hr2ctU1WtDfVyrUa8VUwMxYkc0yHU+qPq9ysSGRIQGwXeIS+c0p+Am Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.8.161514 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __DATE_TZ_RU 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' Terratec Cinergy S2 USB HD Rev.2 support. Signed-off-by: Igor M. Liplianin diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c index 7ced62d..9a7a333 100644 --- a/drivers/media/dvb/dvb-usb/dw2102.c +++ b/drivers/media/dvb/dvb-usb/dw2102.c @@ -1243,6 +1243,13 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d) { u8 obuf[3] = { 0xe, 0x80, 0 }; u8 ibuf[] = { 0 }; + + if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) + err("command 0x0e transfer failed."); + + obuf[0] = 0xe; + obuf[1] = 0x02; + obuf[2] = 1; if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) err("command 0x0e transfer failed."); @@ -1536,6 +1543,7 @@ enum dw2102_table_entry { X3M_SPC1400HD, TEVII_S421, TEVII_S632, + TERRATEC_CINERGY_S2_R2, }; static struct usb_device_id dw2102_table[] = { @@ -1556,6 +1564,7 @@ static struct usb_device_id dw2102_table[] = { [X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)}, [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)}, [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)}, + [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)}, { } }; @@ -1957,7 +1966,7 @@ static struct dvb_usb_device_properties su3000_properties = { }}, } }, - .num_device_descs = 3, + .num_device_descs = 4, .devices = { { "SU3000HD DVB-S USB2.0", { &dw2102_table[GENIATECH_SU3000], NULL }, @@ -1971,6 +1980,10 @@ static struct dvb_usb_device_properties su3000_properties = { { &dw2102_table[X3M_SPC1400HD], NULL }, { NULL }, }, + { "Terratec Cinergy S2 USB HD Rev.2", + { &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL }, + { NULL }, + }, } };