spi: Merge up old fix

[linux-block.git] / drivers / spi / spi-zynqmp-gqspi.c

diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
index c309dedfd6020becd59f0499dd24952b2200c743..9a46b2478f4e98bd38c794b17fa7a2bdae4e36f4 100644 (file)
--- a/drivers/spi/spi-zynqmp-gqspi.c
+++ b/drivers/spi/spi-zynqmp-gqspi.c
@@ -14,9 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
-#include <linux/of_irq.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/spi/spi.h>
@@ -1295,8 +1293,8 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
        zynqmp_qspi_init_hw(xqspi);
 
        xqspi->irq = platform_get_irq(pdev, 0);
-       if (xqspi->irq <= 0) {
-               ret = -ENXIO;
+       if (xqspi->irq < 0) {
+               ret = xqspi->irq;
                goto clk_dis_all;
        }
        ret = devm_request_irq(&pdev->dev, xqspi->irq, zynqmp_qspi_irq,