From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: [PATCH 1/2] ASoC: Pay attention to driver supplied DAI IDs Date: Tue, 12 Oct 2010 15:57:55 +0100 Message-ID: <1286895476-23198-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from opensource2.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id A4F19243C1 for ; Tue, 12 Oct 2010 16:58:06 +0200 (CEST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Liam Girdwood Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, Mark Brown List-Id: alsa-devel@alsa-project.org The driver can specify a DAI ID number so use that. Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4f6ea8c..c20cf7f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3015,7 +3015,10 @@ int snd_soc_register_dais(struct device *dev, } dai->dev = dev; - dai->id = i; + if (dai->driver->id) + dai->id = dai->driver->id; + else + dai->id = i; dai->driver = &dai_drv[i]; if (!dai->driver->ops) dai->driver->ops = &null_dai_ops; -- 1.7.1