Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+6 -2
+6 -2
drivers/spi/spi-xilinx.c
··· 341 341 342 342 if (ipif_isr & XSPI_INTR_TX_EMPTY) { /* Transmission completed */ 343 343 complete(&xspi->done); 344 + return IRQ_HANDLED; 344 345 } 345 346 346 - return IRQ_HANDLED; 347 + return IRQ_NONE; 347 348 } 348 349 349 350 static int xilinx_spi_find_buffer_size(struct xilinx_spi *xspi) ··· 456 455 xspi->buffer_size = xilinx_spi_find_buffer_size(xspi); 457 456 458 457 xspi->irq = platform_get_irq(pdev, 0); 459 - if (xspi->irq >= 0) { 458 + if (xspi->irq < 0 && xspi->irq != -ENXIO) { 459 + ret = xspi->irq; 460 + goto put_master; 461 + } else if (xspi->irq >= 0) { 460 462 /* Register for SPI Interrupt */ 461 463 ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0, 462 464 dev_name(&pdev->dev), xspi);