diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-stm32-qspi.c | |
parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
-rw-r--r-- | drivers/spi/spi-stm32-qspi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 655e4afbfb2a..9ac6f9fe13cf 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c | |||
@@ -570,11 +570,8 @@ static int stm32_qspi_probe(struct platform_device *pdev) | |||
570 | } | 570 | } |
571 | 571 | ||
572 | irq = platform_get_irq(pdev, 0); | 572 | irq = platform_get_irq(pdev, 0); |
573 | if (irq < 0) { | 573 | if (irq < 0) |
574 | if (irq != -EPROBE_DEFER) | ||
575 | dev_err(dev, "IRQ error missing or invalid\n"); | ||
576 | return irq; | 574 | return irq; |
577 | } | ||
578 | 575 | ||
579 | ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0, | 576 | ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0, |
580 | dev_name(dev), qspi); | 577 | dev_name(dev), qspi); |