aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-02-02 14:45:54 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 08:49:35 -0700
commit3cf2600e7e8ec23e59c803460105f5ad7f15843a (patch)
treebc5ebac5ab398c1cd4be2ce0f5ffa37c4913cdd5
parent7bc9597fec2c87457aec0f410e907263c7304096 (diff)
downloadlinux-linaro-stable-3cf2600e7e8ec23e59c803460105f5ad7f15843a.tar.gz
PCI hotplug: check ioremap() return value in ibmphp_ebda.c
commit ba02b242bbf8e4e1bc63d62e8ccec33b4e5ea132 upstream. check ioremap() return value. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pci/hotplug/ibmphp_ebda.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 7d3bf31d224d..5becbdee4027 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/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);