From patchwork Tue Jul 14 18:43:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 235548 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3998271ilg; Tue, 14 Jul 2020 12:05:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxHU1QwFGoL9YRMc4FqA+Ujl41bUekrl1Ctl1NA6BzWNeOHbRIV5EcF4RCZq/MwQxrgn4C X-Received: by 2002:a17:906:e2ca:: with SMTP id gr10mr5730101ejb.81.1594753504871; Tue, 14 Jul 2020 12:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753504; cv=none; d=google.com; s=arc-20160816; b=fmUa5xWg37b9sItRrHlCQD+Xu87l8SgRB6TI/HM4kMF7JA12aykMlFUxR6b3CdUHbZ GuT50zktjBKXkM7FVLhYgY10ubh3/psf0ZhQBAt8Md7M2h1ktTQrpVLgln1aGu9zpJHV /gozy0kfEFNyqY982VJWDKwo8ebAX5Ol3TWfPrZBF6++AXh3pGQeT+levmvIFfJ7NKQi jcE8JYwBkUdzWf5jsIKgaDSuSx+lYFdUriDAhRAScZKYg2n6tXmEOuY2FQIhcod23urx gq2pn71sFjxUyZ8LwxXIs83DD99NzHaVQPe9ywEbbQfvHuflOQZCM27/D2uS3x0BFFrd AKmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gjjvJAXTNrOlxZSSp4/oK7kqKlIe33DeMfkpTE+oVTM=; b=I4YYwHLZXR1WU5NB4SIBpLh1LE7I1ymaZx0/+Bju76cd+IxjVkOMAiWlr8nTHyJ4GX OhROEmZTzrO/OWqdjHT1cnYVsW8zHMYnb8kKPbdGBUZAKoGOCx7tKDAdPhyqCzevWFvT FTVbvZ2PZambndf5MMXAM4t7btlC4O8uJ9uKkQotxwgNE3dPiGcKKP8TpX5ak6sOmGw8 ZaifjyHXzsPCkM4Pl2TWEvt7ge0HGguWWHhlMybT92CK84+77ekrdWjEDDqEcWqzr/jW DESNDA+AsX82ItRIOkAzI8Bq8fdTNl4pw+qMxD/mv6r7p0n6bO9/s0prXA7BaTJc9RLW ykQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="V/nIzGaW"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn22si12981381edb.477.2020.07.14.12.05.04; Tue, 14 Jul 2020 12:05:04 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="V/nIzGaW"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730052AbgGNSz1 (ORCPT + 15 others); Tue, 14 Jul 2020 14:55:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730223AbgGNSzY (ORCPT ); Tue, 14 Jul 2020 14:55:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C346B222B9; Tue, 14 Jul 2020 18:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752924; bh=kFlVpf3xsjPd5uBp1qmNbTQ/O1AJA5LuZSfT32sZWqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/nIzGaW1hnAueh9v7Fp/dvKiW0wkldy9pM6iJaf8rQL+KVMRgdLEXo5YDFMSLcoJ AkGIMu7JhewlsU6cnzJmCdm1JedsEmifgGswLz2Hz2YWlNbHt8nmcg+RMA0amqPknL veHTq+QGdUJ8kHGbnpdQTvvpnx3nVew0VsKGDqRE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin Subject: [PATCH 5.7 052/166] ASoC: fsl_mqs: Fix unchecked return value for clk_prepare_enable Date: Tue, 14 Jul 2020 20:43:37 +0200 Message-Id: <20200714184118.368907272@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit 15217d170a4461c1d4c1ea7c497e1fc1122e42a9 ] Fix unchecked return value for clk_prepare_enable, add error handler in fsl_mqs_runtime_resume. Fixes: 9e28f6532c61 ("ASoC: fsl_mqs: Add MQS component driver") Signed-off-by: Shengjiu Wang Acked-by: Nicolin Chen Link: https://lore.kernel.org/r/5edd68d03def367d96268f1a9a00bd528ea5aaf2.1592888591.git.shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_mqs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c index b44b134390a39..69aeb0e71844d 100644 --- a/sound/soc/fsl/fsl_mqs.c +++ b/sound/soc/fsl/fsl_mqs.c @@ -265,10 +265,20 @@ static int fsl_mqs_remove(struct platform_device *pdev) static int fsl_mqs_runtime_resume(struct device *dev) { struct fsl_mqs *mqs_priv = dev_get_drvdata(dev); + int ret; - clk_prepare_enable(mqs_priv->ipg); + ret = clk_prepare_enable(mqs_priv->ipg); + if (ret) { + dev_err(dev, "failed to enable ipg clock\n"); + return ret; + } - clk_prepare_enable(mqs_priv->mclk); + ret = clk_prepare_enable(mqs_priv->mclk); + if (ret) { + dev_err(dev, "failed to enable mclk clock\n"); + clk_disable_unprepare(mqs_priv->ipg); + return ret; + } if (mqs_priv->use_gpr) regmap_write(mqs_priv->regmap, IOMUXC_GPR2,