From patchwork Mon Jul 19 14:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479856 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4209730jao; Mon, 19 Jul 2021 08:04:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQGceM/sne3hoCSyUaBjOXDzYTF4PfQgRulF6+Lxx2duJDJ3/yS0bUOc0mgPNkEmwoC2or X-Received: by 2002:a05:6e02:c30:: with SMTP id q16mr14001039ilg.75.1626707046594; Mon, 19 Jul 2021 08:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707046; cv=none; d=google.com; s=arc-20160816; b=CISzQAkHcpEMn3tbpWQ0iiv+Hq//KIdgTfrait4cz9GLJtKw+L+Kl/gh8w3o2lb6zE ihL3EPmwnH2XRLgGbABC0hb0q3loyHLC3oUm7M1KaR1+4PCAVrQYbOZXsbAFhjEQjrB2 bbHK1jIwoB0nZDxsRV8TTxOFwFME7f220wAmjdyUPBxDf72ItAe0OxAPRidHcY/r9TGt AwMzZTxUqdBSKXhpBd+u4sOLntyjj0+GRZewRtiI5XAh8lI2Fg4ws9L4jHNRure3Drfk QLL0XQUKJqEVUvdHmZBBEYJW6kQYIqkBEKEg3C1G1kKEodYbEQQmiHFkjgA3llXCIMRB iVbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6z2Xj4pzBypLhxnDbSE5yNqsj4i25fTgLGPxUED9Y6I=; b=m3ibpo1QYlblAcXRTqQwBiQgitS81zXheFAKgQ0onCDlnI+kWv5hT7gZPUHGIDOBza lrtDVz5OOofvmk9m28spKzV3YxoBBHrOskB3l+uffJqQG4YHhgrZxM8Nq4wC2KgsTPT1 SeyjoaG5TiTcFj6O6IQJZcShiRPDYqFQTOnHUd+nKZcUGu6pRF//cdUYNd5h4gdpwAVP o5RVtU2bAcXAvxUaAtrGCNnYQOcIxbNOauP9MTReCBIt8K0GC2AH+anuBy9lfUXKS15Z jLVKTxpoxJF4qwweoGnsCHjG7L9rxyd4p/HgD0IyhW0ZOWyj4CC+aiigIrvi3YPGXtR8 FJpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=h5ifCQ3P; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t26si1788091ioj.103.2021.07.19.08.04.06; Mon, 19 Jul 2021 08:04:06 -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=@linuxfoundation.org header.s=korg header.b=h5ifCQ3P; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242596AbhGSOXZ (ORCPT + 12 others); Mon, 19 Jul 2021 10:23:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:54960 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242781AbhGSOWG (ORCPT ); Mon, 19 Jul 2021 10:22:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 346936120A; Mon, 19 Jul 2021 15:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706930; bh=18h5QgI/2WUOpyySkBczK5t5R7/zMrYxEkMhhzuJCBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5ifCQ3PXSF5dJA+Ull41Z0nRTz71UTYtKU7k9Q4u09JJLJ59Y+A6dOSLqNETmgko Mj48pd9yllLUWlUTvtnZpiUgbF+nNC+lVzEBcQFLxSI0qqme5KncYnmDtCAClH0FRC osuGvAceuQb8BqfYL2jydca+I8VPYPRyOgPYG9nU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhen Lei , Mark Brown , Sasha Levin Subject: [PATCH 4.4 156/188] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() Date: Mon, 19 Jul 2021 16:52:20 +0200 Message-Id: <20210719144941.600702438@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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(-) -- 2.30.2 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b927f9c81d92..e69a7f8b6163 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3394,7 +3394,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++) {