The patch

   spi: stm32: return the get_irq error

has been applied to the spi tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.1

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 8d1467a68426c61807c97163459b481ecb714523 Mon Sep 17 00:00:00 2001
From: Fabien Dessenne <fabien.desse...@st.com>
Date: Wed, 24 Apr 2019 14:38:44 +0200
Subject: [PATCH] spi: stm32: return the get_irq error

During probe, return the "get_irq" error value instead of -ENOENT. This
allows the driver to be defer probed if needed.

Signed-off-by: Fabien Dessenne <fabien.desse...@st.com>
Acked-by: Amelie Delaunay <amelie.delau...@st.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/spi/spi-stm32.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c
index 4186ed20d796..b222ce8d083e 100644
--- a/drivers/spi/spi-stm32.c
+++ b/drivers/spi/spi-stm32.c
@@ -1839,8 +1839,9 @@ static int stm32_spi_probe(struct platform_device *pdev)
 
        spi->irq = platform_get_irq(pdev, 0);
        if (spi->irq <= 0) {
-               dev_err(&pdev->dev, "no irq: %d\n", spi->irq);
-               ret = -ENOENT;
+               ret = spi->irq;
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "failed to get irq: %d\n", ret);
                goto err_master_put;
        }
        ret = devm_request_threaded_irq(&pdev->dev, spi->irq,
-- 
2.20.1

Reply via email to