From patchwork Wed Jul 26 14:17:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 108769 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp880183obm; Wed, 26 Jul 2017 07:19:49 -0700 (PDT) X-Received: by 10.223.145.162 with SMTP id 31mr1095608wri.171.1501078789257; Wed, 26 Jul 2017 07:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501078789; cv=none; d=google.com; s=arc-20160816; b=s656iST48AeuUuEU5d/gYA6BAxAF3G4tHxdeYNds/6D0YXKsHqyWoc00aaGwlBL+io TO3flAPr/4eH0Qm+p9p8/yQiNOpZbfD4L0wmqOjzTuybPQJPJtW34ViaAn/FXyJa+UNA i+JBc3JApF5r+pVX4u05Wnze55pmIml/aVs7pnc7lh81pb0I10A8wQwvmoc4qMjAo3ed wiWtWzrxxZwe/rb9mkiK/ABXnzDNQtgwWslbNeoDLfyCf4OH1g2KEKTt5DPpBR1PEYYi vrcaTwegl7llq5YQb2kFGryGo+j1+mHrcDKt+11v4gGhJc+anfL1j5oaHmFtrX+V39vh M2ZQ== 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 :delivered-to:arc-authentication-results; bh=xgkKM/PaUMT4FtcisYt2RSGs0+X21XcmbisPYLDuaK8=; b=DRzJtxEmooEgvdEApKvU5vWdo1nbMnV8Ene0foDxfCnXqFhw8jyr6tthwdYPahxEJQ NzlHaVDDKSUfNPsq4T+BajStElQbYzZDul5iHoqe1jw74ToXeaTlpPqIi38VAX/fLSrZ 4qkk1v+5G28F8Kn1CDhs25mk81IiHM7k6I4a0GNuPKUFlWyiJRfxMwxVM931sXFTmctv lo4JHKW+Uv5rGts2Xo+qDN8eLSblu6rUljt0sLfG5ULD0Ae0qe8VoHvmYdd63vsNekza oZ3A2roZQR8G1qqe90i+qq6EG5ExOrep7Lx/xhQzXm/zFwGnYRLXOHn4B073erM8FiRw elKw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id e16si9460621wmd.209.2017.07.26.07.19.49; Wed, 26 Jul 2017 07:19:49 -0700 (PDT) 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; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2417226751C; Wed, 26 Jul 2017 16:18:00 +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 A0D81267519; Wed, 26 Jul 2017 16:17:57 +0200 (CEST) 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=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 4CA97267497 for ; Wed, 26 Jul 2017 16:17:29 +0200 (CEST) Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1daN7f-0000dt-SA; Wed, 26 Jul 2017 14:17:14 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1daN7d-0003YF-9Y; Wed, 26 Jul 2017 15:17:09 +0100 From: Mark Brown To: Arvind Yadav In-Reply-To: <1500977674-27960-3-git-send-email-arvind.yadav.cs@gmail.com> Message-Id: Date: Wed, 26 Jul 2017 15:17:09 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, sbkim73@samsung.com, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, krzk@kernel.org, tiwai@suse.com, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: samsung: s3c24xx: Handle return value of clk_prepare_enable." 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: samsung: s3c24xx: Handle return value of clk_prepare_enable. has been applied to the asoc tree at git://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 8698475a94d0b7eb21efaa346d507dc4932f2032 Mon Sep 17 00:00:00 2001 From: Arvind Yadav Date: Tue, 25 Jul 2017 15:44:29 +0530 Subject: [PATCH] ASoC: samsung: s3c24xx: Handle return value of clk_prepare_enable. clk_prepare_enable() can fail here and we must check its return value. Signed-off-by: Arvind Yadav Reviewed-by: Krzysztof Kozlowski Signed-off-by: Mark Brown --- sound/soc/samsung/s3c24xx-i2s.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 91e6871e5413..8d58d02183bf 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -340,6 +340,7 @@ EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) { + int ret; snd_soc_dai_init_dma_data(dai, &s3c24xx_i2s_pcm_stereo_out, &s3c24xx_i2s_pcm_stereo_in); @@ -348,7 +349,9 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) pr_err("failed to get iis_clock\n"); return PTR_ERR(s3c24xx_i2s.iis_clk); } - clk_prepare_enable(s3c24xx_i2s.iis_clk); + ret = clk_prepare_enable(s3c24xx_i2s.iis_clk); + if (ret) + return ret; /* Configure the I2S pins (GPE0...GPE4) in correct mode */ s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2), @@ -377,7 +380,11 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai) static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai) { - clk_prepare_enable(s3c24xx_i2s.iis_clk); + int ret; + + ret = clk_prepare_enable(s3c24xx_i2s.iis_clk); + if (ret) + return ret; writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);