linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Use check_legacy_ioport() for ISAPnP
@ 2006-09-27  7:18 David Woodhouse
  2006-09-27  8:18 ` Olaf Hering
  0 siblings, 1 reply; 7+ messages in thread
From: David Woodhouse @ 2006-09-27  7:18 UTC (permalink / raw)
  To: paulus; +Cc: linuxppc-dev

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

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 @@ static int __init isapnp_init(void)
 		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);

-- 
dwmw2

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2006-10-02 10:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-27  7:18 [PATCH] Use check_legacy_ioport() for ISAPnP David Woodhouse
2006-09-27  8:18 ` Olaf Hering
2006-09-27 12:49   ` David Woodhouse
2006-09-27 13:05     ` Olaf Hering
2006-10-02  9:38       ` Olaf Hering
2006-10-02  9:42         ` David Woodhouse
2006-10-02 10:00           ` Olaf Hering

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).