diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-26 13:25:59 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-27 12:43:32 -0500 |
commit | 434aafc1aefb5eb6e8c8d15284c8f929be756521 (patch) | |
tree | c5c7cb106302dc0712b62e451fc934af7b3c7692 /drivers/pci | |
parent | bd064f0a231af336218838474ea45a64f1672190 (diff) |
PCI: Don't clear IORESOURCE_UNSET when updating BAR
Clear IORESOURCE_UNSET when we assign an address to a resource, not when we
write the address to the BAR.
Also, drop the "BAR %d: set to %pR" message; this is mostly redundant with
the "BAR %d: assigned %pR" message from pci_assign_resource().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/setup-res.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 0474b0217fdf..725d5b28398c 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -101,11 +101,6 @@ void pci_update_resource(struct pci_dev *dev, int resno) | |||
101 | 101 | ||
102 | if (disable) | 102 | if (disable) |
103 | pci_write_config_word(dev, PCI_COMMAND, cmd); | 103 | pci_write_config_word(dev, PCI_COMMAND, cmd); |
104 | |||
105 | res->flags &= ~IORESOURCE_UNSET; | ||
106 | dev_dbg(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n", | ||
107 | resno, res, (unsigned long long)region.start, | ||
108 | (unsigned long long)region.end); | ||
109 | } | 104 | } |
110 | 105 | ||
111 | int pci_claim_resource(struct pci_dev *dev, int resource) | 106 | int pci_claim_resource(struct pci_dev *dev, int resource) |