From patchwork Tue Mar 31 15:15:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Nisota X-Patchwork-Id: 15398 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2VFGKN4011275 for ; Tue, 31 Mar 2009 15:16:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753288AbZCaPQU (ORCPT ); Tue, 31 Mar 2009 11:16:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756122AbZCaPQU (ORCPT ); Tue, 31 Mar 2009 11:16:20 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:30668 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753288AbZCaPQT (ORCPT ); Tue, 31 Mar 2009 11:16:19 -0400 Received: by fg-out-1718.google.com with SMTP id e12so31586fga.17 for ; Tue, 31 Mar 2009 08:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type; bh=OMA1yBkBxPmRS0RWgSYAAtcI9iksV71MZb0WN97lzog=; b=U6rZrjH7WTJpcJlbZjjgvf/1Gew0jFMJHEtw+YI1NA5CC3u7E2NJ0NNmtM8DkiQLum Mfa9MjJP7sN6xtBKCoA59SDUIB4RJ/majTF2ZYwurHSSpsn1koXit1nbfMDh40v8dO0n eVhgT6Ab9t6JCPoR5/3CveRndMIdIAuCFAj3c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; b=BeVpf59vQgHyeZEX1y7CxW4/v49MYPjA/IcE4NgipvtlriHVQGYFm2lNmpHdYvcAUH sh84QHBfYjCsW68SuulG8wVnkqzgUJME77oZN7U1bzoD2syWXjOm1FfFMbNXQuZsfIF6 M9nrGClk8sOBWSJLmiqOMnmfTaLVZjrqNwHSs= Received: by 10.86.59.2 with SMTP id h2mr5242761fga.30.1238512576758; Tue, 31 Mar 2009 08:16:16 -0700 (PDT) Received: from ?0.0.0.0? ([89.248.169.108]) by mx.google.com with ESMTPS id e20sm5345614fga.14.2009.03.31.08.15.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 31 Mar 2009 08:16:16 -0700 (PDT) Message-ID: <49D2338C.7040703@gmail.com> Date: Tue, 31 Mar 2009 08:15:24 -0700 From: Alan Nisota User-Agent: Thunderbird 2.0.0.21 (X11/20090318) MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: [PATCH] Remove support for Genpix-CW3K (damages hardware) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org I have been informed by the manufacturer that the patch currently in the v4l tree to support the Genpix-CW3K version of the hardware will actually damage the firmware on recent units. As he seems to not want this hardware supported in Linux, and I do not know how to detect the difference between affected and not-affected units, I am requesting the immediate removal of support for this device. This patch removes a portion of the changeset dce7e08ed2b1 applied 2007-08-18 relating to this specific device. Signed off by: Alan Nisota diff -r 5567e82c34a0 linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h Tue Mar 31 07:24:14 2009 -0300 +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h Tue Mar 31 07:48:00 2009 -0700 @@ -225,7 +225,6 @@ #define USB_PID_GENPIX_8PSK_REV_1_WARM 0x0201 #define USB_PID_GENPIX_8PSK_REV_2 0x0202 #define USB_PID_GENPIX_SKYWALKER_1 0x0203 -#define USB_PID_GENPIX_SKYWALKER_CW3K 0x0204 #define USB_PID_SIGMATEK_DVB_110 0x6610 #define USB_PID_MSI_DIGI_VOX_MINI_II 0x1513 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 diff -r 5567e82c34a0 linux/drivers/media/dvb/dvb-usb/gp8psk.c --- a/linux/drivers/media/dvb/dvb-usb/gp8psk.c Tue Mar 31 07:24:14 2009 -0300 +++ b/linux/drivers/media/dvb/dvb-usb/gp8psk.c Tue Mar 31 07:48:00 2009 -0700 @@ -138,8 +138,6 @@ static int gp8psk_power_ctrl(struct dvb_ if (onoff) { gp8psk_usb_in_op(d, GET_8PSK_CONFIG,0,0,&status,1); if (! (status & bm8pskStarted)) { /* started */ - if(gp_product_id == USB_PID_GENPIX_SKYWALKER_CW3K) - gp8psk_usb_out_op(d, CW3K_INIT, 1, 0, NULL, 0); if (gp8psk_usb_in_op(d, BOOT_8PSK, 1, 0, &buf, 1)) return -EINVAL; } @@ -168,8 +166,6 @@ static int gp8psk_power_ctrl(struct dvb_ /* Turn off 8psk power */ if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1)) return -EINVAL; - if(gp_product_id == USB_PID_GENPIX_SKYWALKER_CW3K) - gp8psk_usb_out_op(d, CW3K_INIT, 0, 0, NULL, 0); } return 0; } @@ -223,7 +219,6 @@ static struct usb_device_id gp8psk_usb_t { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) }, - { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, { 0 }, }; MODULE_DEVICE_TABLE(usb, gp8psk_usb_table); @@ -254,7 +249,7 @@ static struct dvb_usb_device_properties .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 4, + .num_device_descs = 3, .devices = { { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver", .cold_ids = { &gp8psk_usb_table[0], NULL }, @@ -267,10 +262,6 @@ static struct dvb_usb_device_properties { .name = "Genpix SkyWalker-1 DVB-S receiver", .cold_ids = { NULL }, .warm_ids = { &gp8psk_usb_table[3], NULL }, - }, - { .name = "Genpix SkyWalker-CW3K DVB-S receiver", - .cold_ids = { NULL }, - .warm_ids = { &gp8psk_usb_table[4], NULL }, }, { NULL }, } diff -r 5567e82c34a0 linux/drivers/media/dvb/dvb-usb/gp8psk.h --- a/linux/drivers/media/dvb/dvb-usb/gp8psk.h Tue Mar 31 07:24:14 2009 -0300 +++ b/linux/drivers/media/dvb/dvb-usb/gp8psk.h Tue Mar 31 07:48:00 2009 -0700 @@ -51,7 +51,6 @@ extern int dvb_usb_gp8psk_debug; #define GET_SIGNAL_LOCK 0x90 /* in */ #define GET_SERIAL_NUMBER 0x93 /* in */ #define USE_EXTRA_VOLT 0x94 -#define CW3K_INIT 0x9d /* PSK_configuration bits */ #define bm8pskStarted 0x01