From nobody Fri Sep 20 16:38:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD38BC7EE2E for ; Mon, 12 Jun 2023 09:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231810AbjFLJLl (ORCPT ); Mon, 12 Jun 2023 05:11:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232430AbjFLJLE (ORCPT ); Mon, 12 Jun 2023 05:11:04 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCC0859DA for ; Mon, 12 Jun 2023 02:06:08 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-977d7bdde43so843011766b.0 for ; Mon, 12 Jun 2023 02:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1686560767; x=1689152767; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=n7+T9ror82USLosqb+kMl4rjrjfhje49/ZyOCNXi7ko=; b=JKzEkLKynaeNnaDVnKlCrW+rJ6NPX6yrmcjLwwFMzvrx+LGGoTZ46EYY9KmOQw5xDf L5ZAn2nVbhCbw7Q97Yeh089Uchbr+imzUnZk19tHLCuR8gJOGIiYQ+jkbvUXFX7hmqPR AUrQNYN6RKc4XrTUhbOWzTLCuBvZUJstuDZ7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686560767; x=1689152767; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n7+T9ror82USLosqb+kMl4rjrjfhje49/ZyOCNXi7ko=; b=NkcPBoE9kbK5tpM/BZ/5R8nBctlKDQZvHRE4qJ3empQrRH7YM12k0vSvYTGYcMWu81 wr+KOzx5tHkHSz/mrHXebnsgBaz1UKzgwwWqGFG6OMJOnQAtFpjS3N99cIbW8wiRiM2M lmN0fn1uK4/Wv/yksbuzx0ctNwFvCi5C/CKPP/enYg86Wna6+xtGI28bawS5aBtfrQWD usu81k5DM1usmxY3XNa1DCLpFYJCSModvkVXEFX05mXi1GNY1CEdnj2+pJgyyuvBZj7x xVR72D9jaDynBj9vFo/0wS0A3NZEj8sWqrhA0eTzMAp1y8Dh0Lb7k1zPJfAesZdn1hYI JkVg== X-Gm-Message-State: AC+VfDxcFDSqBFk2+r8h4EMF+pFv1pY9BgRqDnsy/3rC9fkft/w7/yXN JW3X22M46fKr1YvooSNuiATv9g== X-Google-Smtp-Source: ACHHUZ5InuqYeOZy5I+/X3fsLat/TnUkv5PBIlf5CBZNkJRYvqzQiZVsCvIG7tT/Degh88f2AnjcCw== X-Received: by 2002:a17:906:9751:b0:96f:c545:6fd with SMTP id o17-20020a170906975100b0096fc54506fdmr8866911ejy.10.1686560766808; Mon, 12 Jun 2023 02:06:06 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:82e9:e3cf:d6f0:4c6a]) by smtp.gmail.com with ESMTPSA id o10-20020a1709061d4a00b0096a742beb68sm4867275ejh.201.2023.06.12.02.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 02:06:06 -0700 (PDT) From: Ricardo Ribalda Delgado Date: Mon, 12 Jun 2023 11:05:31 +0200 Subject: [PATCH v2 1/2] ASoC: mediatek: mt8173: Fix snd_soc_component_initialize error path MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230612-mt8173-fixup-v2-1-432aa99ce24d@chromium.org> References: <20230612-mt8173-fixup-v2-0-432aa99ce24d@chromium.org> In-Reply-To: <20230612-mt8173-fixup-v2-0-432aa99ce24d@chromium.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Kuninori Morimoto Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Ricardo Ribalda Delgado , Dan Carpenter , stable@kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1198; i=ribalda@chromium.org; h=from:subject:message-id; bh=jo+X8uO9gXWIQ4Yp4MLiXi4sgrrGbroD4LCNGNV+4M4=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkht/4yUvNcHG35BG/KrFS5PrlpHzlqdRlErE+H JfuJwL5SciJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZIbf+AAKCRDRN9E+zzrE iG8SD/4qf+ADY8vriM5ijaza7D/izE7k3S+iQQf8OA2OdmLDusxEwt0iCSonmOkAQndcQwzS0GH jEY3n8wpzqw0Ze01VbE8RQrERCr6UKBTO/6gtNyyqLC/pDjNdX7RTNk+QLMONTchv5luMdp6vdJ KkbwJGHlL+us+x3zasP1S8fTsg6m9OmhUNV2CYa/yBw4WaZu4qTA5xN76h2enS00k9Z/qFDHKQl mnDMs0H8HeMaZStjyC2oFscPcjaH0CNtGNnbRdXDBGotVAHH5QnTc3bakku8J2YBIVrgzhIag5i EjzQ2FM9adCpfKPPUnFW+LgHyfMjPgttDv0icRtzHqp7B8KDPZYuzUYlu2Iy8VsImCjklQAtvzu iOrymbnM98iYTzMX6G2BFyofM2ntQoINlib58d6Ud/eROQ9/MGpWyVTqjDC9vb3A+8L8Y5UIi8q WqytQosaCOH+4DFyTY0a0cnQlN+x9p333zBrcI1J09EKREZyaesS6WiUipncrOxUdMwjMPYjS+/ 33D2atsdtmdjIB9GElht1KH3ziKp6hVjoWbywTW677Rv7OHNDoTbMmI6+jOjqIyRj6awpZNctaW i7XKRgC+8yknqBXjUxyYeBy5z5FDEGPOz/9hRbv5FTiG4hnUqwmtvRVnSygWxg0VD25jxUrenM8 6F60DksxzEzPdKA== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the second component fails to initialize, cleanup the first on. Reported-by: Dan Carpenter Cc: stable@kernel.org Fixes: f1b5bf07365d ("ASoC: mt2701/mt8173: replace platform to component") Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediate= k/mt8173/mt8173-afe-pcm.c index f93c2ec8beb7..ff25c44070a3 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -1156,14 +1156,14 @@ static int mt8173_afe_pcm_dev_probe(struct platform= _device *pdev) comp_hdmi =3D devm_kzalloc(&pdev->dev, sizeof(*comp_hdmi), GFP_KERNEL); if (!comp_hdmi) { ret =3D -ENOMEM; - goto err_pm_disable; + goto err_cleanup_components; } =20 ret =3D snd_soc_component_initialize(comp_hdmi, &mt8173_afe_hdmi_dai_component, &pdev->dev); if (ret) - goto err_pm_disable; + goto err_cleanup_components; =20 #ifdef CONFIG_DEBUG_FS comp_hdmi->debugfs_prefix =3D "hdmi"; --=20 2.41.0.162.gfafddb0af9-goog From nobody Fri Sep 20 16:38:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6447BC7EE2E for ; Mon, 12 Jun 2023 09:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233970AbjFLJLo (ORCPT ); Mon, 12 Jun 2023 05:11:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232614AbjFLJLH (ORCPT ); Mon, 12 Jun 2023 05:11:07 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E31C359E0 for ; Mon, 12 Jun 2023 02:06:09 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5151934a4e3so6093657a12.1 for ; Mon, 12 Jun 2023 02:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1686560768; x=1689152768; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kY+WBQ4nCNMkOm+dsWka5XZ07KlSQo9hmsWmmoRsa2U=; b=D/FV+MyUBaCM3IKM4xkwpx9FWzBrg6NGsYOcVTfAQJTPdosotXa3jIfj/+r38tQxI+ 7+ldoE/VbKwiDBVYZ5HDh6ED+ZnbXiXVjVUcxRy9uhra3dRevtgTMI+T+zGVeU4XpEag WVWd1n2zMl9LSMBxCJbzIqMlkTSr+eReQJVPE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686560768; x=1689152768; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kY+WBQ4nCNMkOm+dsWka5XZ07KlSQo9hmsWmmoRsa2U=; b=P87pKbgqzuwfneU6NEERTK1tFIMz8xX8i7ybBTonZXWXhHS/hKlgo+65DkvAzs0OvM TbS+GrEcEm0/JLixTBdcuJJjwF6P0ohA2dMFvppwwI1MRbiXyRPHvtackNPtgMGPgooY J3pvZOk64pQrE93lI9XoTr7q/3nkDKmiAc83pxqKvgxrHWX1zRoqu4B9eD+rVx4tQlbN 63ehMf/j6RtZKgnR49KkC+ktCORiALad0S01d9+ctzIiYZHOy0a2Gfe7gwuI4u+w5W0V KYJ/Vt30vGh54nLCkQrhs4TPBELpEM/463WWIq7X126DRnw2fmDx+feL5v6BneAFfvdF HdgQ== X-Gm-Message-State: AC+VfDzvVcby5fvpMQ/a1bsJy6hSLz2QI6yPROBosWlLcuKpwUUei/x/ 0TxhQemAIAnnumo63BxGHJdDBA== X-Google-Smtp-Source: ACHHUZ7a8jPTUOkb1YxMy6Q3DErGRuymN9KwkCEHdB9Brblou3evSACnVlv+NKkp5rTB5TcjBWoPVg== X-Received: by 2002:a17:906:eec3:b0:96a:63d4:2493 with SMTP id wu3-20020a170906eec300b0096a63d42493mr9479085ejb.40.1686560768406; Mon, 12 Jun 2023 02:06:08 -0700 (PDT) Received: from alco.roam.corp.google.com ([2620:0:1059:10:82e9:e3cf:d6f0:4c6a]) by smtp.gmail.com with ESMTPSA id o10-20020a1709061d4a00b0096a742beb68sm4867275ejh.201.2023.06.12.02.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 02:06:07 -0700 (PDT) From: Ricardo Ribalda Delgado Date: Mon, 12 Jun 2023 11:05:32 +0200 Subject: [PATCH v2 2/2] ASoC: mediatek: mt8173: Fix irq error path MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230612-mt8173-fixup-v2-2-432aa99ce24d@chromium.org> References: <20230612-mt8173-fixup-v2-0-432aa99ce24d@chromium.org> In-Reply-To: <20230612-mt8173-fixup-v2-0-432aa99ce24d@chromium.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Kuninori Morimoto Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Ricardo Ribalda Delgado , Dan Carpenter , stable@kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1601; i=ribalda@chromium.org; h=from:subject:message-id; bh=FuOIzKqJLwG9hXBBeHMxHbhQlBDg6wGyDQM7J3HtDFw=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkht/6RtNidnnzWFvIX6ID1lzhHxvqegz1CZUmV u0KTXtZhwiJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZIbf+gAKCRDRN9E+zzrE iI6qD/9WuMsBy28BDqRklrMZs1zMwNmB6km8F0J5xnGYfBZKfhx0KO3Qf4CjjYp2tzvddMaeisX LleVvftuzAVp+ddSoEyGNitooKWpJgSR5dlgSi+ga+eD0mNMkq+wXeNOhBvDrFV1PCj87x3EkZa 1evfQQDCE5xliJzbqVQ0mbopQsI7nHqEKtauzC9POVpa0LlvoJdXuuSFRlR0u/bouTHe73ef0l1 vvK1l/DwaL25mPrKDlt1anBHCoZAcHub7nfAY1bNqDOo27n9pTOmw5K0lmoAJCs7r3be04W25pM m4tXlQMi3ua+Q6A5Y9l3rSklTSuVzUWLcuLVgK9QQtXwLF+IQESkD99IFUovazf4zOccU6lpCDs jfaiaH3wKUUvBPe0gYwEBMk+3bxfypBHIQ+KQfJUGdGZlF7RYIQ99ty1HU8sX2cJnCmUifXFgCv uK5oWbWb9vTs6i5XOK7auzTS5t/T4vHJp8ABatHp/17WmwrJZd90T6JjYsjCYDEW6sdM+8hJcS5 i+DNYGENfBwR+KsgJHKFq3zDqpOFLymJ7QSlNwnLU+U2yDG+auTdZJNz6Zyt9f6lbPB3zfC2fsT ewya7Wod3/w8v87ZxtYhIIBAChXZzAN4PHk5mE9LxcuJh4MT25CQWfCg3Mm2VYzkPwU1GU2RVgE mlbQnqcwI0gq11Q== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After reordering the irq probe, the error path was not properly done. Lets fix it. Reported-by: Dan Carpenter Cc: stable@kernel.org Fixes: 4cbb264d4e91 ("ASoC: mediatek: mt8173: Enable IRQ when pdata is read= y") Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediate= k/mt8173/mt8173-afe-pcm.c index ff25c44070a3..06269f7e3756 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -1070,6 +1070,10 @@ static int mt8173_afe_pcm_dev_probe(struct platform_= device *pdev) =20 afe->dev =3D &pdev->dev; =20 + irq_id =3D platform_get_irq(pdev, 0); + if (irq_id <=3D 0) + return irq_id < 0 ? irq_id : -ENXIO; + afe->base_addr =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(afe->base_addr)) return PTR_ERR(afe->base_addr); @@ -1175,14 +1179,11 @@ static int mt8173_afe_pcm_dev_probe(struct platform= _device *pdev) if (ret) goto err_cleanup_components; =20 - irq_id =3D platform_get_irq(pdev, 0); - if (irq_id <=3D 0) - return irq_id < 0 ? irq_id : -ENXIO; ret =3D devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, 0, "Afe_ISR_Handle", (void *)afe); if (ret) { dev_err(afe->dev, "could not request_irq\n"); - goto err_pm_disable; + goto err_cleanup_components; } =20 dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n"); --=20 2.41.0.162.gfafddb0af9-goog