From patchwork Mon Jul 19 14:52:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479959 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4246453jao; Mon, 19 Jul 2021 08:44:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFX804sBIOKUaWbcwYCt7mDlb/FDxaJfTRVvGLgeVWMIB/NbtoIVROHQpbpI6GxD23HAxh X-Received: by 2002:a50:ff0a:: with SMTP id a10mr35491302edu.273.1626709454132; Mon, 19 Jul 2021 08:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709454; cv=none; d=google.com; s=arc-20160816; b=dWlXmQyJJbLblQY9HasRLPAU85eMjEJsQ7wu+aHSBL+3u7siA043JeylNVchJH8RLl hHal12WLn/1sDnyaVFQQzzY04uCMTUgckqmaZdEVVCPcSr7Snn0AYYF5QVlYxuDgs5c3 shhhA7u+YkBHlnYVQd5ssEDF1BiJCJI25KyxJYge+6I7krf2tkUm/UyA9kPajDDqETdb iofLw1IoQGCXlrEjuHzGOhmR2P89O3/+bsKEtU17H1U5fc7U/N8WYJpb6kYRj9suasFH pjGrJJz3hriWqM3Q8SLeGwyZguHlbBTQBQ6X74/nDB4y3gkkci1Uzril67QuroatLonG jTFA== 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=k1KWhNi1NLH3fn5m+piOq1woc1xKkg4bki0O6YF7hFw=; b=BGN6EuDCUnUi+uyvYDqR2t/dnUetetSdKH7nwnMbC6QqnJB9tQ2y/ma+EEW+6+s0C4 MuNAaQe6ecCqebNqLdXGzcPifEY2nDlBIxOz7Fb4WI9cKfCqCsO1gbCeSXoUISuMFXg5 IAnd5RACmpkBLjv0CSi8vaestu6WZv7TxnBuIYMQGVX9XQ7mIXd/6DeQnZWcF+2fohRH HevWcOhF/6VIp3cet3xqo+m2oAFy2Q9Vyso8wBkcX5g4zFGpEvtUPzTtq3TgmPw3xW7L VFuXDI3nKNnf/lqSD51P27e1C9vOfNE1PifrRF3lvxkkedtpfkd08jw2lvWPMAaSkOSE 92vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="yl3//SUP"; 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 g21si21526529edq.557.2021.07.19.08.44.13; Mon, 19 Jul 2021 08:44:14 -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="yl3//SUP"; 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 S1343823AbhGSPDc (ORCPT + 12 others); Mon, 19 Jul 2021 11:03:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:33248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245694AbhGSPBr (ORCPT ); Mon, 19 Jul 2021 11:01:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6FDCC61221; Mon, 19 Jul 2021 15:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709347; bh=8Q3uEpjy477WheXpk2ubs8evkJ+OhUEsTaZIHEwoyiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yl3//SUPXQoySSEFUhUGPrD68LYj+bz7P5iSeEfgy9O/umhc3vI7ML6oYiIHSY35f Geuarlf/wk4xYN7uEAFRx1Cl2fNhdWOGx+m+bKC+xv7h+Pn/vckIOfx7S5k70ovCNu vfsq931mdl3VbgWkf/POgwtuF5iIorsPpYJXaW0o= 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.19 347/421] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() Date: Mon, 19 Jul 2021 16:52:38 +0200 Message-Id: <20210719144958.313681688@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 595fe20bbc6d..8531b490f6f6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3510,7 +3510,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++) {