diff options
| author | Bjorn Helgaas <[email protected]> | 2008-06-02 22:42:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-06-02 22:59:06 +0000 |
| commit | 4b34fe156455d26ee6ed67b61539f136bf4e439c (patch) | |
| tree | 901d16b111b1cbb2b7eaed549e54b548643e8a45 /drivers/pnp/system.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | kernel-4b34fe156455d26ee6ed67b61539f136bf4e439c.tar.gz kernel-4b34fe156455d26ee6ed67b61539f136bf4e439c.zip | |
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 <[email protected]>
Tested-by: Avuton Olrich <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'drivers/pnp/system.c')
| -rw-r--r-- | drivers/pnp/system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c index 9c2496dbeee4..8f0a570509c5 100644 --- a/drivers/pnp/system.c +++ b/drivers/pnp/system.c @@ -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); |