From 4ec60101436b3adb8a8240a2fc6ba17422ddfe61 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 2 Feb 2010 14:45:54 -0800 Subject: [PATCH] --- yaml --- r: 180973 b: refs/heads/master c: ba02b242bbf8e4e1bc63d62e8ccec33b4e5ea132 h: refs/heads/master i: 180971: 1ceac074f6faee121bdb7cfd96839b1762937983 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/ibmphp_ebda.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9f3124db5c4d..8d007a75f822 100644 --- 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 index 7d3bf31d224d..5becbdee4027 100644 --- 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);