From: Lars-Peter Clausen Date: Fri, 15 Jul 2016 09:04:18 +0000 (+0200) Subject: spi: xilinx: Handle errors from platform_get_irq() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4db9bf548bb00d84ba7dfd70f124de16386c0c55;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git spi: xilinx: Handle errors from platform_get_irq() The Xilinx SPI driver can operate without an IRQ, but not every error returned by platform_get_irq() means that no IRQ was specified. It will also return an error if the IRQ specification is invalid or the IRQ provider is not yet available (EPROBE_DEFER). So instead of ignoring all errors only ignore ENXIO, which means no IRQ was specified, and propagate all other errors to device driver core. Signed-off-by: Lars-Peter Clausen Acked-by: Ricardo Ribalda Delgado Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 3009121173cd..e62eb9ace825 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -455,7 +455,10 @@ static int xilinx_spi_probe(struct platform_device *pdev) xspi->buffer_size = xilinx_spi_find_buffer_size(xspi); 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 */ ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0, dev_name(&pdev->dev), xspi);