patch-2.4.22 linux-2.4.22/drivers/hotplug/ibmphp_ebda.c

Next file: linux-2.4.22/drivers/i2c/Config.in
Previous file: linux-2.4.22/drivers/hotplug/acpiphp_res.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/drivers/hotplug/ibmphp_ebda.c linux-2.4.22/drivers/hotplug/ibmphp_ebda.c
@@ -292,6 +292,7 @@
 	rio_complete = 0;
 	hs_complete = 0;
 
+	/* FIXME: This is x86-32 specific, and even then PC specific.. */
 	io_mem = ioremap ((0x40 << 4) + 0x0e, 2);
 	if (!io_mem )
 		return -ENOMEM;
@@ -299,6 +300,9 @@
 	iounmap (io_mem);
 	debug ("returned ebda segment: %x\n", ebda_seg);
 	
+	if(ebda_seg == 0)		/* No EBDA */
+		return -ENOENT;
+	
 	io_mem = ioremap (ebda_seg<<4, 65000);
 	if (!io_mem )
 		return -ENOMEM;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)