Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bd1c4a authored by David Woodhouse's avatar David Woodhouse Committed by Paul Mackerras
Browse files

[POWERPC] Use check_legacy_ioport() for ISAPnP 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 61e37ca2

drivers/pnp/isapnp/core.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1049,6 +1049,10 @@ static int __init isapnp_init(void) 
		printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");

		printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");

		return 0;

		return 0;

	}

	}

#ifdef CONFIG_PPC_MERGE

	if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))

		return -EINVAL;

#endif

#ifdef ISAPNP_REGION_OK

#ifdef ISAPNP_REGION_OK

	if (!request_region(_PIDXR, 1, "isapnp index")) {

	if (!request_region(_PIDXR, 1, "isapnp index")) {

		printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);

		printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);