From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: Ulf Hansson <ulf.hansson@linaro.org>, <linux-mmc@vger.kernel.org>
Cc: Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
<linux-amlogic@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>, <stable@vger.kernel.org>
Subject: [PATCH v3 02/12] mmc: meson-gx: fix deferred probing
Date: Sat, 17 Jun 2023 23:36:12 +0300 [thread overview]
Message-ID: <20230617203622.6812-3-s.shtylyov@omp.ru> (raw)
In-Reply-To: <20230617203622.6812-1-s.shtylyov@omp.ru>
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. Since commit ce753ad1549c ("platform: finally disallow IRQ0
in platform_get_irq() and its ilk") IRQ0 is no longer returned by those APIs,
so we now can safely ignore it...
Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking")
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
---
Changes in version 3:
- added the platform_get_irq() commit reference to the patch description and
the Cc: tag marking the 1st kernel version containing it;
- added Neil's tag .
Changes in version 2:
- updated the fix due to the surrounding code change;
- refreshed the patch;
- removed stray newline in the Fixes: tag;
- slightly reformatted the patch description.
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 b8514d9d5e73..75f97dce7ef3 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1192,8 +1192,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
return PTR_ERR(host->regs);
host->irq = platform_get_irq(pdev, 0);
- if (host->irq <= 0)
- return -EINVAL;
+ if (host->irq < 0)
+ return host->irq;
cd_irq = platform_get_irq_optional(pdev, 1);
mmc_gpio_set_cd_irq(mmc, cd_irq);
--
2.26.3
next prev parent reply other threads:[~2023-06-17 20:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-17 20:36 [PATCH v3 00/12] Fix deferred probing in the MMC/SD drivers Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 01/12] mmc: bcm2835: fix deferred probing Sergey Shtylyov
2023-06-17 20:36 ` Sergey Shtylyov [this message]
2023-06-17 20:36 ` [PATCH v3 03/12] mmc: mtk-sd: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 04/12] mmc: mvsdio: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 05/12] mmc: omap: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 06/12] mmc: omap_hsmmc: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 07/12] mmc: owl: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 08/12] mmc: sdhci-acpi: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 09/12] mmc: sdhci-spear: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 10/12] mmc: sh_mmcif: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 11/12] mmc: sunxi: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 12/12] mmc: usdhi60rol0: " Sergey Shtylyov
2023-06-19 11:43 ` [PATCH v3 00/12] Fix deferred probing in the MMC/SD drivers Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230617203622.6812-3-s.shtylyov@omp.ru \
--to=s.shtylyov@omp.ru \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=stable@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox