summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-04 16:51:34 +0200
committerMark Brown <broonie@kernel.org>2017-09-04 16:51:34 +0200
commitecb478bf866b8450c724958815e8d46b97c1b113 (patch)
treecc668ec3e976206398ba5a11f278c67182c4b6e8 /drivers/spi
parentMerge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/stm32', 'spi/... (diff)
parentspi: xlp: fix error return code in xlp_spi_probe() (diff)
downloadlinux-ecb478bf866b8450c724958815e8d46b97c1b113.tar.xz
linux-ecb478bf866b8450c724958815e8d46b97c1b113.zip
Merge remote-tracking branch 'spi/topic/xlp' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-xlp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-xlp.c b/drivers/spi/spi-xlp.c
index 80cb4d6af892..74a01b09a8a5 100644
--- a/drivers/spi/spi-xlp.c
+++ b/drivers/spi/spi-xlp.c
@@ -393,8 +393,8 @@ static int xlp_spi_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
- dev_err(&pdev->dev, "no IRQ resource found\n");
- return -EINVAL;
+ dev_err(&pdev->dev, "no IRQ resource found: %d\n", irq);
+ return irq;
}
err = devm_request_irq(&pdev->dev, irq, xlp_spi_interrupt, 0,
pdev->name, xspi);