From 61ea3692205aa7f2c86dc1fafcd2eb0c4235b4c3 Mon Sep 17 00:00:00 2001
From: Roel Kluin <[roel.kluin@gmail.com]>
Date: Tue, 11 Aug 2009 14:52:11 -0700
Subject: [PATCH] --- yaml --- r: 156652 b: refs/heads/master c:
 e7369e01eb85550ed60dd1b0e120b69dfb03dc23 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/iosapic.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b5c312c3ad37..db391b85281d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5359dffd4396f281c5b77de1acbee6fb1b333b23
+refs/heads/master: e7369e01eb85550ed60dd1b0e120b69dfb03dc23
diff --git a/trunk/arch/ia64/kernel/iosapic.c b/trunk/arch/ia64/kernel/iosapic.c
index c48b03f2b61d..dab4d393908c 100644
--- a/trunk/arch/ia64/kernel/iosapic.c
+++ b/trunk/arch/ia64/kernel/iosapic.c
@@ -1072,6 +1072,10 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
 	}
 
 	addr = ioremap(phys_addr, 0);
+	if (addr == NULL) {
+		spin_unlock_irqrestore(&iosapic_lock, flags);
+		return -ENOMEM;
+	}
 	ver = iosapic_version(addr);
 	if ((err = iosapic_check_gsi_range(gsi_base, ver))) {
 		iounmap(addr);