Commit 56432b73 authored by Mark Brown's avatar Mark Brown

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

parents 1cb2e848 d3364847
...@@ -341,9 +341,10 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id) ...@@ -341,9 +341,10 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id)
if (ipif_isr & XSPI_INTR_TX_EMPTY) { /* Transmission completed */ if (ipif_isr & XSPI_INTR_TX_EMPTY) { /* Transmission completed */
complete(&xspi->done); complete(&xspi->done);
return IRQ_HANDLED;
} }
return IRQ_HANDLED; return IRQ_NONE;
} }
static int xilinx_spi_find_buffer_size(struct xilinx_spi *xspi) static int xilinx_spi_find_buffer_size(struct xilinx_spi *xspi)
...@@ -455,7 +456,10 @@ static int xilinx_spi_probe(struct platform_device *pdev) ...@@ -455,7 +456,10 @@ static int xilinx_spi_probe(struct platform_device *pdev)
xspi->buffer_size = xilinx_spi_find_buffer_size(xspi); xspi->buffer_size = xilinx_spi_find_buffer_size(xspi);
xspi->irq = platform_get_irq(pdev, 0); xspi->irq = platform_get_irq(pdev, 0);
if (xspi->irq >= 0) { if (xspi->irq < 0 && xspi->irq != -ENXIO) {
ret = xspi->irq;
goto put_master;
} else if (xspi->irq >= 0) {
/* Register for SPI Interrupt */ /* Register for SPI Interrupt */
ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0, ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0,
dev_name(&pdev->dev), xspi); dev_name(&pdev->dev), xspi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment