Merge remote-tracking branch 'spi/topic/xlp' into spi-next

This commit is contained in:
Mark Brown
2017-09-04 15:51:34 +01:00

View File

@@ -393,8 +393,8 @@ static int xlp_spi_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "no IRQ resource found\n"); dev_err(&pdev->dev, "no IRQ resource found: %d\n", irq);
return -EINVAL; return irq;
} }
err = devm_request_irq(&pdev->dev, irq, xlp_spi_interrupt, 0, err = devm_request_irq(&pdev->dev, irq, xlp_spi_interrupt, 0,
pdev->name, xspi); pdev->name, xspi);