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

Commit bbe413b4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Andi Kleen
Browse files

ISAPNP: handle independent options following dependent ones 



The ISAPNP spec recommends that independent options precede
dependent ones, but this is not actually required.  The current
ISAPNP code incorrectly puts such trailing independent options
at the end of the last dependent option list.

This patch fixes that bug by resetting the current option list
to the independent list when we see an "End Dependent Functions"
tag.  PNPBIOS and PNPACPI handle this the same way.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e2a1a6f1

drivers/pnp/isapnp/core.c

+7 −2
Original line number Diff line number Diff line
@@ -584,14 +584,14 @@ static int __init isapnp_create_device(struct pnp_card *card, 
{

	int number = 0, skip = 0, priority, compat = 0;

	unsigned char type, tmp[17];

	struct pnp_option *option;

	struct pnp_option *option, *option_independent;

	struct pnp_dev *dev;

	u32 eisa_id;

	char id[8];



	if ((dev = isapnp_parse_device(card, size, number++)) == NULL)

		return 1;

	option = pnp_register_independent_option(dev);

	option_independent = option = pnp_register_independent_option(dev);

	if (!option) {

		kfree(dev);

		return 1;
@@ -613,6 +613,7 @@ static int __init isapnp_create_device(struct pnp_card *card, 
				size = 0;

				skip = 0;

				option = pnp_register_independent_option(dev);

				option_independent = option;

				if (!option) {

					kfree(dev);

					return 1;
@@ -662,6 +663,10 @@ static int __init isapnp_create_device(struct pnp_card *card, 
		case _STAG_ENDDEP:

			if (size != 0)

				goto __skip;

			if (option_independent == option)

				dev_warn(&dev->dev, "missing "

					 "_STAG_STARTDEP tag\n");

			option = option_independent;

			dev_dbg(&dev->dev, "end dependent options\n");

			break;

		case _STAG_IOPORT: