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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 11076C433E0 for ; Tue, 23 Jun 2020 21:38:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E01FD2078A for ; Tue, 23 Jun 2020 21:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948304; bh=SYI8L8UXp3utrE/Mql5+0mceAEsW4wnfH/JOJyjihK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ySeBdRGC1Lkp1Uni0dmtz7tWEs5/G21WnIJyW2npeQ53QMGrluvUUnstlBJe5BeeQ 7t+anld54m7bebt5s+hl40elC5gqQpFlrIyL5mtAJ04DgM0z85pgpfOPFpg/4S0D8Z 4PNDCb4Z03FbsEqgmFXVVh1dRDGO5Zsi9vhPLl2A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393498AbgFWViV (ORCPT ); Tue, 23 Jun 2020 17:38:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:49372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387945AbgFWUIV (ORCPT ); Tue, 23 Jun 2020 16:08:21 -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 F34D82080C; Tue, 23 Jun 2020 20:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942900; bh=SYI8L8UXp3utrE/Mql5+0mceAEsW4wnfH/JOJyjihK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rCW2K1sDue8jFIx82KlaNWWhRTlgA2gIV8hZ+6HiqmkiUMlVZVb1EU6aRMtfaZONn O61Y79kPLwJiXmvkaHbcz9ZUmAj/2RNShRZH5WCOemY2oBjFfDnGley/OwZ2LDyG3u 6WOXkDWqlmk2eK+iwOxlmZTS0d5kJsio8XD0fYh4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Wei Yongjun , Mark Brown , Sasha Levin Subject: [PATCH 5.7 180/477] ASoC: SOF: core: fix error return code in sof_probe_continue() Date: Tue, 23 Jun 2020 21:52:57 +0200 Message-Id: <20200623195416.092361693@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 7d8785bc7adbb4dc5ba8ee06994107637848ded8 ] Fix to return negative error code -ENOMEM from the IPC init error handling case instead of 0, as done elsewhere in this function. Fixes: c16211d6226d ("ASoC: SOF: Add Sound Open Firmware driver core") Reported-by: Hulk Robot Signed-off-by: Wei Yongjun Link: https://lore.kernel.org/r/20200509093337.78897-1-weiyongjun1@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 91acfae7935c9..74b4382162167 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -176,6 +176,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) /* init the IPC */ sdev->ipc = snd_sof_ipc_init(sdev); if (!sdev->ipc) { + ret = -ENOMEM; dev_err(sdev->dev, "error: failed to init DSP IPC %d\n", ret); goto ipc_err; } -- 2.25.1