From patchwork Wed Jul 2 11:18:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=BCrg_Billeter?= X-Patchwork-Id: 4465241 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B4F89F390 for ; Wed, 2 Jul 2014 12:42:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A0BB203B1 for ; Wed, 2 Jul 2014 12:42:57 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 09D1D2024F for ; Wed, 2 Jul 2014 12:42:56 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0658C26527E; Wed, 2 Jul 2014 14:42:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 4E26C2650CE; Wed, 2 Jul 2014 14:42:17 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 378E326514C; Wed, 2 Jul 2014 13:20:38 +0200 (CEST) Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79]) by alsa0.perex.cz (Postfix) with ESMTP id D12862650C0 for ; Wed, 2 Jul 2014 13:20:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=bitron.ch; s=default; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From; bh=nURMEFtnjYsb6cowXUnROP3DY6PZ1G6f9KTklHbLKZ8=; b=YumaKN/jeeryjMxwdmBzm5PKpsKF9XCdOE5irXQ90Qin4D7bgsHnXG1LsazBdQKtUT2z9UQxQcM7aiaDoG2+Zgo7J6IEvjLd0a6Y8HnX9GZkJXBDcTzupzsv2lX5+qtq; Received: from 46-127-237-10.dynamic.hispeed.ch ([46.127.237.10]:38481 helo=jivy.bitron.ch) by cpanel09.rubas.ch with esmtpsa (UNKNOWN:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1X2IaT-000sT2-58; Wed, 02 Jul 2014 13:20:29 +0200 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= To: Mark Brown , Kuninori Morimoto Date: Wed, 2 Jul 2014 13:18:51 +0200 Message-Id: <1404299931-21384-1-git-send-email-j@bitron.ch> X-Mailer: git-send-email 2.0.1 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.rubas.ch X-AntiAbuse: Original Domain - alsa-project.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - bitron.ch X-Get-Message-Sender-Via: cpanel09.rubas.ch: authenticated_id: juerg@bitron.ch X-Mailman-Approved-At: Wed, 02 Jul 2014 14:42:14 +0200 Cc: alsa-devel@alsa-project.org, Takashi Iwai , linux-kernel@vger.kernel.org, Magnus Damm , Liam Girdwood , =?UTF-8?q?J=C3=BCrg=20Billeter?= , Simon Horman Subject: [alsa-devel] [PATCH] ASoC: rsnd: fixup index of SSI mod when SRC is used X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The default index 1 was used as the loop was terminated before the following code could be reached: if (mod[i] == this) index = i; Signed-off-by: Jürg Billeter --- sound/soc/sh/rcar/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 4e86265..d737fea 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -295,9 +295,11 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma, mod[0] = NULL; /* for "mem" */ index = 1; for (i = 1; i < MOD_MAX; i++) { - if (!src) { - mod[i] = ssi; + if (!ssi) { break; + } else if (!src) { + mod[i] = ssi; + ssi = NULL; } else if (!dvc) { mod[i] = src; src = NULL;