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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 38B26C11F69 for ; Sat, 10 Jul 2021 02:25:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D785613E4 for ; Sat, 10 Jul 2021 02:25:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233884AbhGJC1v (ORCPT ); Fri, 9 Jul 2021 22:27:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:41906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233541AbhGJC03 (ORCPT ); Fri, 9 Jul 2021 22:26:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3BE7F61402; Sat, 10 Jul 2021 02:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883822; bh=7wFhkZ0IlNgtCAhPr5ZrgV3HSP2CLK9OONDhD4XycyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kwRvFa9jS1tzZENhCVvzN6nyu6BYvHIMDdTgXMMrXcnDdZ8R1SncPjSKHLSoWxlO7 hDNiNxSR10EBQcwhPaX4fEkGNsZYSk+AgmhwN2epn+kEqnsSkYxIs+mJSy5///7Fav J8f5o0Yzm3w2NQL3aG5s7HAOonKUHw5LyM7GpbsSfiYpy3U7VyM3Wp2BM/RC7lBsUD LTJvzuAFc4fd/L38pksOkF24ny9VpTLOLcgEd4ZhD4KhgZEjwO+P+TwV1GsgGztGAD PQrqQGVWTNzl2VzoCNXbIWXRha0qLwZOYyPIwd0NWUbL3To+/SI8wxoBQ1qFZ40NcW DgHiIicvO6TzQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhen Lei , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.12 071/104] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() Date: Fri, 9 Jul 2021 22:21:23 -0400 Message-Id: <20210710022156.3168825-71-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022156.3168825-1-sashal@kernel.org> References: <20210710022156.3168825-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhen Lei [ Upstream commit 7d3865a10b9ff2669c531d5ddd60bf46b3d48f1e ] When devm_kcalloc() fails, the error code -ENOMEM should be returned instead of -EINVAL. Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210617103729.1918-1-thunder.leizhen@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6680c12716d4..6d4b08e918de 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2796,7 +2796,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, if (!routes) { dev_err(card->dev, "ASoC: Could not allocate DAPM route table\n"); - return -EINVAL; + return -ENOMEM; } for (i = 0; i < num_routes; i++) { -- 2.30.2