From 486a9026ba66b0e11c07c1a984fa7a9f3f38dd0f Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Fri, 25 Jul 2008 19:44:41 -0700
Subject: [PATCH] --- yaml --- r: 106145 b: refs/heads/master c:
 c491b2ffae3fad5e6e3cb2320b46bb8ea8729d49 h: refs/heads/master i:   106143:
 93b3f558f002619a171b0c80bd6790eb0dc7bfd7 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/mfd/asic3.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bdf38c373f3a..bd5fc0b5fa13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3c6ba986ab4527b6dfacf9f3b9e40f72466a8b2
+refs/heads/master: c491b2ffae3fad5e6e3cb2320b46bb8ea8729d49
diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c
index 3b870e7fb3e1..eabf0bfccab4 100644
--- a/trunk/drivers/mfd/asic3.c
+++ b/trunk/drivers/mfd/asic3.c
@@ -314,10 +314,12 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
 	unsigned long clksel = 0;
 	unsigned int irq, irq_base;
 	int map_size;
+	int ret;
 
-	asic->irq_nr = platform_get_irq(pdev, 0);
-	if (asic->irq_nr < 0)
-		return asic->irq_nr;
+	ret = platform_get_irq(pdev, 0);
+	if (ret < 0)
+		return ret;
+	asic->irq_nr = ret;
 
 	/* turn on clock to IRQ controller */
 	clksel |= CLOCK_SEL_CX;