Merge branch 'linus' into x86/xen

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 113a0468ffcb..68d6f4988fb5 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -353,11 +353,12 @@ static int __init xilinx_spi_probe(struct platform_device *dev)
                 goto put_master;
         }
 
-        xspi->irq = platform_get_irq(dev, 0);
-        if (xspi->irq < 0) {
+        ret = platform_get_irq(dev, 0);
+        if (ret < 0) {
                 ret = -ENXIO;
                 goto unmap_io;
         }
+        xspi->irq = ret;
 
         master->bus_num = pdata->bus_num;
         master->num_chipselect = pdata->num_chipselect;