From 3edfc8565457d053b17f866c3dd1dd23287341f4 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Thu, 29 Oct 2009 17:24:59 +0200 Subject: [PATCH] --- yaml --- r: 174754 b: refs/heads/master c: 1ed6743918abbec69c0f0b725fa56e3c3248bbab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98f138773d1c..c2ad7d0d2890 100644 --- 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 index bb2cc39b64ff..9cefc54a0125 100644 --- 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);