diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
| commit | 58b860ed4a77d9cb17b78e663a0341b79a12e240 (patch) | |
| tree | a82d81a9075394e7dc8b46fe2732270e24390a7a /drivers/spi/spi-stm32.c | |
| parent | 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b (diff) | |
| parent | 7e95b16625a3659a75c0ba4d5b0802324d16be13 (diff) | |
| download | linux-58b860ed4a77d9cb17b78e663a0341b79a12e240.tar.gz linux-58b860ed4a77d9cb17b78e663a0341b79a12e240.tar.bz2 linux-58b860ed4a77d9cb17b78e663a0341b79a12e240.zip | |
Merge branch 'spi-5.1' into spi-linus
Diffstat (limited to 'drivers/spi/spi-stm32.c')
| -rw-r--r-- | drivers/spi/spi-stm32.c | 5 |
1 files 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, |