aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRoel Kluin <[roel.kluin@gmail.com]>2009-08-11 14:52:11 -0700
committerFenghua Yu <fenghua.yu@intel.com>2009-08-11 14:52:11 -0700
commite7369e01eb85550ed60dd1b0e120b69dfb03dc23 (patch)
treea833d98ed9388f3a1d1072fb73cea1ac529256f0 /arch
parentia64/topology.c: exit cache_add_dev when kobject_init_and_add fails (diff)
downloadlinux-dev-e7369e01eb85550ed60dd1b0e120b69dfb03dc23.tar.xz
linux-dev-e7369e01eb85550ed60dd1b0e120b69dfb03dc23.zip
arch/ia64/kernel/iosapic: missing test after ioremap()
Missing test after ioremap() Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Fenghua Yu <fenghua.yu@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/iosapic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index c48b03f2b61d..dab4d393908c 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/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);