drop queue-5.4/asoc-mediatek-mt8173-fix-irq-error-path.patch

diff --git a/queue-5.4/asoc-mediatek-mt8173-fix-irq-error-path.patch b/queue-5.4/asoc-mediatek-mt8173-fix-irq-error-path.patch
deleted file mode 100644 (file)
index 197110d..0000000
--- a/queue-5.4/asoc-mediatek-mt8173-fix-irq-error-path.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f9c058d14f4fe23ef523a7ff73734d51c151683c Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda Delgado <ribalda@chromium.org>
-Date: Mon, 12 Jun 2023 11:05:32 +0200
-Subject: ASoC: mediatek: mt8173: Fix irq error path
-
-From: Ricardo Ribalda Delgado <ribalda@chromium.org>
-
-commit f9c058d14f4fe23ef523a7ff73734d51c151683c upstream.
-
-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>
-Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Link: https://lore.kernel.org/r/20230612-mt8173-fixup-v2-2-432aa99ce24d@chromium.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
-+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
-@@ -1073,6 +1073,10 @@ static int mt8173_afe_pcm_dev_probe(stru
- 
-       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);
-@@ -1148,14 +1152,11 @@ static int mt8173_afe_pcm_dev_probe(stru
-       if (ret)
-               goto err_pm_disable;
- 
--      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");

diff --git a/queue-5.4/series b/queue-5.4/series
index 9a68b1f5548691c5fdcc3a38dd33d7ee45301fa2..a91822c4c7d4f3a97b1f14ad8249d5d8e04020c5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -173,7 +173,6 @@ revert-f2fs-fix-potential-corruption-when-moving-a-directory.patch
 fs-establish-locking-order-for-unrelated-directories.patch
 fs-lock-moved-directories.patch
 btrfs-fix-race-when-deleting-quota-root-from-the-dirty-cow-roots-list.patch
-asoc-mediatek-mt8173-fix-irq-error-path.patch
 arm-orion5x-fix-d2net-gpio-initialization.patch
 fs-no-need-to-check-source.patch
 fanotify-disallow-mount-sb-marks-on-kernel-internal-pseudo-fs.patch