---

yaml --- r: 97563 b: refs/heads/master c: 4b34fe1 h: refs/heads/master i: 97561: f133ab0 97559: 9cab9f9 v: v3
git-mirror · Jun 2, 2008 · 1ab74f0 · 1ab74f0
1 parent fb93885
commit 1ab74f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3b25b32e8bef526cca748e1ba023c6bdd705a99
+refs/heads/master: 4b34fe156455d26ee6ed67b61539f136bf4e439c
diff --git a/trunk/drivers/pnp/quirks.c b/trunk/drivers/pnp/quirks.c
@@ -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;
 			}
 		}
 	}

diff --git a/trunk/drivers/pnp/system.c b/trunk/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);