git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
iosapic.c
diff --git
a/arch/ia64/kernel/iosapic.c
b/arch/ia64/kernel/iosapic.c
index
c48b03f
..
dab4d39
100644
(file)
--- 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);