From patchwork Wed May 26 04:52:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 102334 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4Q4nDQS006833 for ; Wed, 26 May 2010 04:51:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750923Ab0EZEvr (ORCPT ); Wed, 26 May 2010 00:51:47 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:19876 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850Ab0EZEvq (ORCPT ); Wed, 26 May 2010 00:51:46 -0400 Received: by fg-out-1718.google.com with SMTP id e12so615426fga.1 for ; Tue, 25 May 2010 21:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type; bh=e2rVsOrxnqnvK5fzyMJkBvHnPIP07Jc9F+fdMeFr+Sg=; b=r6fHFDcSeGVHLhNZKvkuPb1GAzorsLl3Gb8Cv5IppgeQ13gFvP1YdJ/yXKYgV0dX+M htLutpLCClscTV6outUeWcxm5gcAI0TMFNYhvHBVjowOzDeLKVEqTjZiZctZ5lZzG1Gx hZTuLZmXj9GJXmA9Klf34l1DOY1FRLWcxgiyg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type; b=MPZH3InPa9jo+saUb9e0jNIw0+Uju27tXmFnSstlip/+6Tq+xTfhRUtNb/hRV9fZ92 arBJ7A55K8Xi8xiwqkBPZNf/5wfpI+BeO9IzbVl+nSjGE2w2ZJrRtCmh+ndFtfKzO/N/ 5dSPtxs4tz8v14NEG2+NFC9SDgWAFh06heLek= Received: by 10.204.13.68 with SMTP id b4mr3381799bka.133.1274849505202; Tue, 25 May 2010 21:51:45 -0700 (PDT) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id r38sm4868292bkk.3.2010.05.25.21.51.42 (version=SSLv3 cipher=RC4-MD5); Tue, 25 May 2010 21:51:44 -0700 (PDT) Date: Wed, 26 May 2010 14:52:19 +1000 From: Dmitri Belimov To: Luis Henrique Fagundes Cc: Linux Media Mailing List , Stefan Ringel , Mauro Carvalho Chehab , Bee Hock Goh Subject: tm6000, alsa Message-ID: <20100526145219.11c81de0@glory.loctelecom.ru> In-Reply-To: <20100518172329.6d9b520a@glory.loctelecom.ru> References: <20100518172329.6d9b520a@glory.loctelecom.ru> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 26 May 2010 04:51:48 +0000 (UTC) diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000.h --- a/linux/drivers/staging/tm6000/tm6000.h Sun May 16 18:48:01 2010 -0300 +++ b/linux/drivers/staging/tm6000/tm6000.h Wed May 26 08:38:12 2010 +1000 @@ -154,6 +154,7 @@ int model; /* index in the device_data struct */ int devno; /* marks the number of this device */ enum tm6000_devtype dev_type; /* type of device */ + struct list_head devlist; v4l2_std_id norm; /* Current norm */ int width,height; /* Selected resolution */ @@ -228,6 +229,8 @@ V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM /* In tm6000-cards.c */ +extern struct list_head tm6000_devlist; +extern struct mutex tm6000_devlist_lock; int tm6000_tuner_callback (void *ptr, int component, int command, int arg); int tm6000_xc5000_callback (void *ptr, int component, int command, int arg); @@ -289,7 +294,7 @@ int tm6000_queue_init(struct tm6000_core *dev); /* In tm6000-alsa.c */ -int tm6000_audio_init(struct tm6000_core *dev, int idx); +//int tm6000_audio_init(struct tm6000_core *dev, int idx); /* Debug stuff */ Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov