---

yaml --- r: 180973 b: refs/heads/master c: ba02b24 h: refs/heads/master i: 180971: 1ceac07 v: v3
git-mirror · Feb 23, 2010 · 4ec6010 · 4ec6010
1 parent eac366a
commit 4ec6010
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 939fdc67350e15aeeea70457d5b4bc1116bb4fd5
+refs/heads/master: ba02b242bbf8e4e1bc63d62e8ccec33b4e5ea132
diff --git a/trunk/drivers/pci/hotplug/ibmphp_ebda.c b/trunk/drivers/pci/hotplug/ibmphp_ebda.c
@@ -261,6 +261,8 @@ int __init ibmphp_access_ebda (void)
 	debug ("returned ebda segment: %x\n", ebda_seg);
 
 	io_mem = ioremap(ebda_seg<<4, 1);
+	if (!io_mem)
+		return -ENOMEM;
 	ebda_sz = readb(io_mem);
 	iounmap(io_mem);
 	debug("ebda size: %d(KiB)\n", ebda_sz);