From 69393464b05716b094138284dcf3c9fed3354a50 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 8 Jun 2023 00:04:40 +0200 Subject: [PATCH] `meson64` `edge` 6.4: drop general-meson-gx-mmc-fix-deferred-probing.patch -- upstreamed - https://lore.kernel.org/linux-arm-kernel/16b74882-d65b-93c9-f72b-1d53bfefa22f@omp.ru/T/#t --- ...al-meson-gx-mmc-fix-deferred-probing.patch | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 patch/kernel/archive/meson64-6.4/general-meson-gx-mmc-fix-deferred-probing.patch diff --git a/patch/kernel/archive/meson64-6.4/general-meson-gx-mmc-fix-deferred-probing.patch b/patch/kernel/archive/meson64-6.4/general-meson-gx-mmc-fix-deferred-probing.patch deleted file mode 100644 index 418dbd1cc2..0000000000 --- a/patch/kernel/archive/meson64-6.4/general-meson-gx-mmc-fix-deferred-probing.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Sergey Shtylyov -Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: mmc: meson-gx: fix deferred probing - -The driver overrides the error codes and IRQ0 returned by platform_get_irq() -to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe -permanently instead of the deferred probing. Switch to propagating the error -codes upstream. IRQ0 is no longer returned by platform_get_irq(), so we now -can safely ignore it... - -Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking") -Signed-off-by: Sergey Shtylyov ---- - drivers/mmc/host/meson-gx-mmc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 5c94ad4661ce..64a1520321b0 100644 ---- a/drivers/mmc/host/meson-gx-mmc.c -+++ b/drivers/mmc/host/meson-gx-mmc.c -@@ -1233,8 +1233,8 @@ static int meson_mmc_probe(struct platform_device *pdev) - } - - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto free_host; - } - --- -Armbian -