From patchwork Thu Feb 12 10:43:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 6806 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 n1CAiQqR018686 for ; Thu, 12 Feb 2009 10:44:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758450AbZBLKoZ (ORCPT ); Thu, 12 Feb 2009 05:44:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758386AbZBLKoZ (ORCPT ); Thu, 12 Feb 2009 05:44:25 -0500 Received: from bombadil.infradead.org ([18.85.46.34]:32837 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758242AbZBLKoX (ORCPT ); Thu, 12 Feb 2009 05:44:23 -0500 Received: from 200.220.139.66.nipcable.com ([200.220.139.66] helo=pedra.chehab.org) by bombadil.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id 1LXZ3N-0004Kv-Vz; Thu, 12 Feb 2009 10:44:22 +0000 Date: Thu, 12 Feb 2009 08:43:56 -0200 From: Mauro Carvalho Chehab To: Patrick Boettcher Cc: Linux Media Mailing List Subject: Re: PULL request Message-ID: <20090212084356.7a921ce0@pedra.chehab.org> In-Reply-To: References: X-Mailer: Claws Mail 3.3.1 (GTK+ 2.10.4; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Wed, 11 Feb 2009 11:48:56 +0100 (CET) Patrick Boettcher wrote: > Hi Mauro, > > I pushed several changesets to my tree and would like to ask you to pull > them. I'm assuming that you want me to pull from http://linuxtv.org/hg/~pb/v4l-dvb/, right? Please, next time specify the pull url, since people may have more than one tree there. > > - [PATCH] Add support for Winfast Dongle Hybrid > - [PATCH] Emtec S810 (1164:2edc) support > - [PATCH] Add Elgato EyeTV Diversity to dibcom driver Hmm... @@ -1774,7 +1775,7 @@ struct dvb_usb_device_properties dib0700 }, }, - .num_device_descs = 5, + .num_device_descs = 7, .devices = { { "Terratec Cinergy HT USB XE", { &dib0700_usb_id_table[27], NULL }, @@ -1798,6 +1799,10 @@ struct dvb_usb_device_properties dib0700 }, { "Asus My Cinema-U3000Hybrid", { &dib0700_usb_id_table[39], NULL }, + { NULL }, + }, + { "Leadtek Winfast Dongle Hybrid", + { &dib0700_usb_id_table[46], NULL }, { NULL }, }, Just one card were added, but the count were incremented twice... It seems that this patch contains a fix for Asus My Cinema-U3000Hybrid (btw, this reminds me that ARRAY_SIZE() discussion we had). Hmm... $ hg log -r 9042 changeset: 9042:80e9cb79ad03 user: Patrick Boettcher date: Sun Sep 07 17:43:33 2008 +0200 summary: Add support for Asus My Cinema U3000 Hybrid September, 2008. For sure this were already sent upstream. We should break this into two separate patches, and send the fix patch upstream. Could you please do it? > - Wipe out an obsolete documentation about Flexcop refactoring > - documentation fix for /Documentation/dvb/technisat.txt > > The most important one is > > - [PATCH] software IRQ watchdog for Flexcop B2C2 DVB PCI cards Hmm... is it really necessary to have a 1ms udelay here? As you know, udelay() will run a do-nothing loop blocking the CPU until it finishes, while msleep() calls schedule(), letting the processor to do something else while waiting. There are very few cases where udelay() should be used: when the time should be very precise. For most cases, msleep() do a better job. > which fixes a problem with the recently added 2.8 revsion of the Technisat > SkyStar2. If possible we should get that into 2.6.29 in order to have a > proper support for this card. Ok, after pulling it, I'll add to 2.6.29 upstream series. Cheers, Mauro --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/linux/drivers/media/dvb/b2c2/flexcop.c Wed Feb 11 11:30:08 2009 +0100 +++ b/linux/drivers/media/dvb/b2c2/flexcop.c Wed Feb 11 11:45:09 2009 +0100 @@ -212,8 +212,7 @@ void flexcop_reset_block_300(struct flex v210.sw_reset_210.Block_reset_enable = 0xb2; fc->write_ibi_reg(fc,sw_reset_210,v210); - msleep(1); - + udelay(1000); fc->write_ibi_reg(fc,ctrl_208,v208_save); }