From patchwork Wed Nov 21 13:30:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151691 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1928573ljp; Wed, 21 Nov 2018 05:30:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/W4MaRGxywviBPQ85W4FCOwd5cHjFikj1UYsCHeC85eAiyCDL3Z88FWikcmtylv67upvQ29 X-Received: by 2002:adf:d1d2:: with SMTP id m18mr6096991wri.138.1542807009667; Wed, 21 Nov 2018 05:30:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542807009; cv=none; d=google.com; s=arc-20160816; b=SKZRFnGwoNGGPVGok3vDnwWrDQh4YloUJY2YLcWza7VkydgMvlRnayGawCvOjH2WOr YsaayuqXzCXGGAFmjWRgFRLPVPwb8qDpHfhU+VYAApQE9LYk2qlOXKkh7/D2dBwIv6Yx 1RDK0apUA5TSkpvsdvrmuWdkZOIKAgu32YUEdS1OOSU5N4ujr1T8mJkXe8jkFrlRiZQz mNR9CPM14llk9l2kJ5x+/F/JmIE3PkTISztca+V4QxxF12jpWM/JHGJfyHbXn5zm+yTR uDrFr2A2OCZoSLSpU4rhkXYGbGCbkBTe17WSi2e8zoD01JDX7n9Amcf6xRSLGr6gKRHy lWQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=MwFgS9Gr6zCLH5IOuVsys/jtraJrmU/GqRxdyipNlVY=; b=FHdPZprwhWoRCd98T/SwxiQG47+jPf4DwJPWa95IN2Rxs2k718GTAX4jyqZW6QuZLo KJVKNJ1cqVg4LUMUyI5kesvoZeBNlcPIkGEMepkevgvUaXNv1w7eqTB/rD3kfMRVxnaQ +HaZzoE0k++CMVgAV5poCoyHpksp/qTphlJLe16f10++6r/W3m4gPxRTFqx1lh9DbxH+ 7Grdi8j1551TPQzyB3YmlsxLc5pmQCYd+ZQv24ZwaJCObQrHUSEgk/bEM4qpqgfJP5zU G0DJOjdKToHqwu+Ga5G41CTdF2/RL6cbRkw/r30p3MpngR6+v7o8JbUZHo3BgZZgFDUu 7ssQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=gCassypT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id d10-v6si42410308wrf.152.2018.11.21.05.30.09; Wed, 21 Nov 2018 05:30:09 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=gCassypT; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B45A2267A8B; Wed, 21 Nov 2018 14:30:08 +0100 (CET) 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 0287E267A70; Wed, 21 Nov 2018 14:30:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id D90D6267A8C for ; Wed, 21 Nov 2018 14:30:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=kGRpDpZ6URt+nfoqANVSfi2Cq2PDP2EeMSZGZjuMnV8=; b=gCassypT6Rb2 kVDk626KKsa349Wgv7w2ecnqwccPj6glyTHpeMSpm34KFYe0HtQaEJg2JBc/9qPSmzB1bAT3LB+9+ UOdI3jLpx1/0/mz30Lhl/e/MNWi49FlBMj5cV1Ue7BSDzKDt3t/VRWxcG8PGeIlcMeHijxCzrqxmX aGyxw=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gPSZv-0003ZE-G6; Wed, 21 Nov 2018 13:30:03 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 2819F11250AE; Wed, 21 Nov 2018 13:30:03 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87zhu3p5d4.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181121133003.2819F11250AE@debutante.sirena.org.uk> Date: Wed, 21 Nov 2018 13:30:03 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rsnd: tidyup rsnd_parse_connect_ssiu_compatible()" to the asoc tree 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: rsnd: tidyup rsnd_parse_connect_ssiu_compatible() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 331e875432ecfb651d9335a18149160c307429ab Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 21 Nov 2018 01:58:30 +0000 Subject: [PATCH] ASoC: rsnd: tidyup rsnd_parse_connect_ssiu_compatible() rsnd_parse_connect_ssiu_compatible() is doing - using rsnd_ssiu_id(), but we use it via rsnd_mod_id() - we can break loop if rsnd_dai_connect() was called This patch fixup these. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssiu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 650b14e99b05..04b1a4836bd3 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -382,9 +382,11 @@ static void rsnd_parse_connect_ssiu_compatible(struct rsnd_priv *priv, for_each_rsnd_ssiu(ssiu, priv, i) { mod = rsnd_mod_get(ssiu); - if ((rsnd_mod_id(ssi_mod) == rsnd_ssiu_id(mod)) && - (rsnd_mod_id_sub(mod) == 0)) + if ((rsnd_mod_id(ssi_mod) == rsnd_mod_id(mod)) && + (rsnd_mod_id_sub(mod) == 0)) { rsnd_dai_connect(mod, io, mod->type); + return; + } } }