From patchwork Wed Jul 5 12:30:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 116121 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1844672vqx; Wed, 5 Jul 2023 05:52:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFG5dHkutLLK65cmqHfW6UuBcfmrLrTiR4tPYpahpGBIPKeRtBDsbFXv7ijCCCHDqwa2D26 X-Received: by 2002:a17:90b:1204:b0:262:d9c3:593b with SMTP id gl4-20020a17090b120400b00262d9c3593bmr12978997pjb.10.1688561574345; Wed, 05 Jul 2023 05:52:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688561574; cv=none; d=google.com; s=arc-20160816; b=k4DbaOjO4MNYiyBauU35ozM7SgKZxcRbZgGSSpIvLjQ3/Qa3ImJ2qkxEWqmNBzQhcu anHfb9yWT4cV/8zS5G5wJMU6RJJdq7WKBftYtM97x9eVTGQ7acNtTKyakd1z+ZS8+Psq euk0hf1yZlzsZDRw8L/tgb3mnfMAMtPN3irQ7xdGkqwPzEYeADHtpTa7z9Yt+dppXqiQ 4pKWomC2UsMjgjGQgholL5JAWbk35NXE9Qwzrg30HobZBMdrCIP3uP9YCpj1XExIzVsq 8q5cTaWhgWzWY10MGYzX4Vu1PFy+QCG8NxqutEd8JwrzXOYD0e83yfk78i2Q7s1pMsZb 5bsg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lS1/6nzRgJGY0G9ceDXgt9dVHP+AVUyFmhmcqOyuh8g=; fh=9OdOKmG51VR9b+WFobJNDPAlI+ZibI7/koqEmOu+XY8=; b=01PuYbW+eDq61kwO1kl8b+TmBVOz0zzoDuQz1BebBqd+qBJeRVlWNZbciT/GS4oPrU C5xqgVRm5zkjREiBI9cdbHHKbYbFKNXK+569Yv/dF7oPrJqjSf5j/nGpvghi6tqpWgg2 EsWKh2XYnNKD3cLLuLabNbWpYsnlQ4NRVT+k0iBA/FGZXpiRgIGIzyzpneyoq9d0Xaez e23eB9j79oFtDz50wwkMO720nQSJX7Dhsmwjd8+aMTVnLQYpMihSvXQUXjAMZhJaTsiz 99Uw5IV5yjqvl/xR1g+6LFi1ldCmSxDx0V2M/59mYfAepBqrxxIysjaJE4b9j2oKlOIc SWIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=F1G8j3jK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ms13-20020a17090b234d00b0025be125bda9si1596900pjb.38.2023.07.05.05.52.39; Wed, 05 Jul 2023 05:52:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=F1G8j3jK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231741AbjGEMdN (ORCPT + 99 others); Wed, 5 Jul 2023 08:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjGEMdL (ORCPT ); Wed, 5 Jul 2023 08:33:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 908D9113; Wed, 5 Jul 2023 05:33:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2261C61558; Wed, 5 Jul 2023 12:33:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CA00C433C7; Wed, 5 Jul 2023 12:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688560389; bh=qDcBaomIkhoRa3+mwqsvw9eva/EwpZwx+a08ZDhuyHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F1G8j3jK0849KbqKJS5dUNA/FOp0LYg/sWx4IR2s8SU71hGnMLB1Dc1xzHbGtdeT+ GNQ5oMXTaZa0UZkoNokxGgfvOOFvsMLL2Fw+brlcIRK5xoznygPEeg7EsMnvr/sl0K ucYgrqPEhgRyyeouQsH9g6gLkWj7uAzvIW2VZ45Hmg5DgjsjsiS/1welAEpXqwvR1g yhGDrWDR9fwgklawYzDZxd3tn4Nr/oDM9QfFba9etng7A2nPY46f/QPIjTel699iTa mkNAufmHMQ2EXRfhKSLdtlexwHK+zEEO14ZfuWGmaSo5JHGdX0A84mm+jiZyKyk+0c tIpItOK1VtFpA== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qH1hK-00084A-0k; Wed, 05 Jul 2023 14:33:30 +0200 From: Johan Hovold To: Mark Brown , Vinod Koul Cc: Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/8] ASoC: qdsp6: audioreach: fix topology probe deferral Date: Wed, 5 Jul 2023 14:30:12 +0200 Message-Id: <20230705123018.30903-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230705123018.30903-1-johan+linaro@kernel.org> References: <20230705123018.30903-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770585141267555717?= X-GMAIL-MSGID: =?utf-8?q?1770585141267555717?= Propagate errors when failing to load the topology component so that probe deferrals can be handled. Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support") Cc: stable@vger.kernel.org # 5.17 Cc: Srinivas Kandagatla Signed-off-by: Johan Hovold Reviewed-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c index cccc59b570b9..130b22a34fb3 100644 --- a/sound/soc/qcom/qdsp6/topology.c +++ b/sound/soc/qcom/qdsp6/topology.c @@ -1277,8 +1277,8 @@ int audioreach_tplg_init(struct snd_soc_component *component) ret = snd_soc_tplg_component_load(component, &audioreach_tplg_ops, fw); if (ret < 0) { - dev_err(dev, "tplg component load failed%d\n", ret); - ret = -EINVAL; + if (ret != -EPROBE_DEFER) + dev_err(dev, "tplg component load failed: %d\n", ret); } release_firmware(fw);