Commit 4b34fe15 authored Jun 02, 2008 by Bjorn Helgaas Committed by Linus Torvalds Jun 02, 2008

PNP: mark resources that conflict with PCI devices "disabled"

Both the PNP/PCI conflict detection quirk and the PNP system
driver must use the same mechanism to mark resources as disabled.

I think it's best to keep the resource and to keep the type bit
(IORESOURCE_MEM, etc), so that we match the list from firmware
as closely as possible.

Fixes this regression from 2.6.25: http://lkml.org/lkml/2008/6/1/82



Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Tested-by: Avuton Olrich <avuton@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c3b25b32

drivers/pnp/quirks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -286,7 +286,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
		pci_name(pdev), i,
		(unsigned long long) pci_start,
		(unsigned long long) pci_end);
		res->flags = 0;
		res->flags \|= IORESOURCE_DISABLED;
		}
		}
		}

drivers/pnp/system.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
		}

		for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
		if (res->flags & IORESOURCE_UNSET)
		if (res->flags & IORESOURCE_DISABLED)
		continue;

		reserve_range(dev, res->start, res->end, 0);