diff options
| author | Ricardo Ribalda Delgado <ribalda@chromium.org> | 2023-06-12 09:43:46 +0200 |
|---|---|---|
| committer | Ricardo Ribalda Delgado <ribalda@chromium.org> | 2023-06-12 11:05:23 +0200 |
| commit | 89d1ae33c9b8b7e5374652e6761f3be1d46654de (patch) | |
| tree | 73dc01fa1d1b2e2f9bca992c64d55b105fefb057 | |
| parent | 6ff59fae48053836c4ebdbf59de8a4675bb4d378 (diff) | |
| download | linux-b4/mt8173-fixup.tar.gz | |
ASoC: mediatek: mt8173: Fix irq error pathb4/mt8173-fixup
After reordering the irq probe, the error path was not properly done.
Lets fix it.
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Cc: stable@kernel.org
Fixes: 4cbb264d4e91 ("ASoC: mediatek: mt8173: Enable IRQ when pdata is ready")
Signed-off-by: Ricardo Ribalda Delgado <ribalda@chromium.org>
| -rw-r--r-- | sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index ff25c44070a3f5..06269f7e37566b 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) afe->dev = &pdev->dev; + irq_id = platform_get_irq(pdev, 0); + if (irq_id <= 0) + return irq_id < 0 ? irq_id : -ENXIO; + afe->base_addr = 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; - irq_id = platform_get_irq(pdev, 0); - if (irq_id <= 0) - return irq_id < 0 ? irq_id : -ENXIO; ret = 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; } dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n"); |