---

yaml --- r: 174754 b: refs/heads/master c: 1ed6743 h: refs/heads/master v: v3
git-mirror · Nov 4, 2009 · 3edfc85 · 3edfc85
1 parent a15e162
commit 3edfc85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af5a8ee05404112f38fb2904747c688bdc31a746
+refs/heads/master: 1ed6743918abbec69c0f0b725fa56e3c3248bbab
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
@@ -165,12 +165,12 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
 {
 	u32 l, sz, mask;
 
-	mask = type ? ~PCI_ROM_ADDRESS_ENABLE : ~0;
+	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
 
 	res->name = pci_name(dev);
 
 	pci_read_config_dword(dev, pos, &l);
-	pci_write_config_dword(dev, pos, mask);
+	pci_write_config_dword(dev, pos, l | mask);
 	pci_read_config_dword(dev, pos, &sz);
 	pci_write_config_dword(dev, pos, l);