commit 07bd1c4a82d1787d6acc32b5e3873cca24f39769
author David Woodhouse <dwmw2@infradead.org> Wed Sep 27 08:18:55 2006 +0100
committer Paul Mackerras <paulus@samba.org> Mon Oct 02 20:27:36 2006 +1000
tree 313a29b73f9b4f2e19fa9f27651d20295eb4b031
parent 61e37ca22b717a9edc3e5e7c7f3603fad464c76d

[POWERPC] Use check_legacy_ioport() for ISAPnP

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

drivers/pnp/isapnp/core.c

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index f2e0179..3ac5b12 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1049,6 +1049,10 @@
 		printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
 		return 0;
 	}
+#ifdef CONFIG_PPC_MERGE
+	if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))
+		return -EINVAL;
+#endif
 #ifdef ISAPNP_REGION_OK
 	if (!request_region(_PIDXR, 1, "isapnp index")) {
 		printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);