From 09f12b31020a2914cab8dabd56a9a42c0201e878 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Wed, 23 Jul 2008 21:29:53 -0700
Subject: [PATCH] --- yaml --- r: 105438 b: refs/heads/master c:
 166a375b657b7af494f4ce3f72c4d2002180da44 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/spi/xilinx_spi.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 75c585231185..551ae78d5a42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a61f5345eba34772a71523227de890a28410f320
+refs/heads/master: 166a375b657b7af494f4ce3f72c4d2002180da44
diff --git a/trunk/drivers/spi/xilinx_spi.c b/trunk/drivers/spi/xilinx_spi.c
index 113a0468ffcb..68d6f4988fb5 100644
--- a/trunk/drivers/spi/xilinx_spi.c
+++ b/trunk/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;