From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6FECC433E7 for ; Mon, 19 Oct 2020 12:33:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 461D520575 for ; Mon, 19 Oct 2020 12:33:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="RpMfgr0m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbgJSMd4 (ORCPT ); Mon, 19 Oct 2020 08:33:56 -0400 Received: from m15111.mail.126.com ([220.181.15.111]:46228 "EHLO m15111.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726336AbgJSMd4 (ORCPT ); Mon, 19 Oct 2020 08:33:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=hLfIQIHuyLNmd+qchF 0iMkyztO/7yUc2IbZTbVRiJyI=; b=RpMfgr0mJqGp+g+dat3z/td2OnhOXL6w2a plj+lFyWuj1vTLz68O5JaQ3HyvmKoVJhANV2n3uKssPo3lFlD+lwpLNedIsU/cga 2i032g+is2b2e0XijgprS4/4Xvw1mSF8o64RMYoW1SBUespGHQvKd08m84GejoQg UpXTxu3Xs= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp1 (Coremail) with SMTP id C8mowACHgx00h41fyctCKg--.6S2; Mon, 19 Oct 2020 20:31:53 +0800 (CST) From: Defang Bo To: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, Vishnuvardhanrao.Ravulapati@amd.com Cc: akshu.agrawal@amd.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Defang Bo Subject: [PATCH] ASoC: amd: move the call to devm_kzalloc below platform_get_resource() Date: Mon, 19 Oct 2020 20:31:29 +0800 Message-Id: <1603110689-5015-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: C8mowACHgx00h41fyctCKg--.6S2 X-Coremail-Antispam: 1Uf129KBjvJXoWrtFW7try7tr13WryxAr48tFb_yoW8JrW3p3 93KFZxtrWrJrWUZ3y8GF48ZF1Ygry29a1UKrs8Z3y3Za45GrWkKFs7JFy0kFWSyFWvka1x XryDta1FvFn0qrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bFPEfUUUUU= X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbitBDC11pEBvHlDgAAsz Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just as the commit <4cb79ef9c6c4>("ASoC: amd: Fix potential NULL pointer dereference"),it makes no sense to allocate any resources if res = platform_get_resource(pdev, IORESOURCE_MEM, 0); fails,so move the call to devm_kzalloc() below the mentioned code. Signed-off-by: Defang Bo --- sound/soc/amd/raven/acp3x-i2s.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index a532e01..c9c69eb 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -302,16 +302,14 @@ static int acp3x_dai_probe(struct platform_device *pdev) struct i2s_dev_data *adata; int ret; - adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), - GFP_KERNEL); - if (!adata) - return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); return -ENOMEM; } + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), GFP_KERNEL); + if (!adata) + return -ENOMEM; adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (!adata->acp3x_base) -- 1.9.1