diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2007-12-18 04:57:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 02:04:27 +0300 |
| commit | 017fc480cc8cc0594dc250951d78e814667ae4c2 (patch) | |
| tree | 04efdbe646e8333be11ba6e9a0fc867109d22245 /drivers/pci | |
| parent | ec0a3a27fbb5792980b8c3ce4a93bc2ee93d0b35 (diff) | |
| download | linux-017fc480cc8cc0594dc250951d78e814667ae4c2.tar.xz | |
PCI: avoid save the same type of cap multiple times
Avoid adding the same type of cap multiple times, otherwise we will see dead loop.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 342857c555de..7248e9fb12bd 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -569,6 +569,7 @@ static int pci_save_pcie_state(struct pci_dev *dev) int pos, i = 0; struct pci_cap_saved_state *save_state; u16 *cap; + int found = 0; pos = pci_find_capability(dev, PCI_CAP_ID_EXP); if (pos <= 0) @@ -577,6 +578,8 @@ static int pci_save_pcie_state(struct pci_dev *dev) save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP); if (!save_state) save_state = kzalloc(sizeof(*save_state) + sizeof(u16) * 4, GFP_KERNEL); + else + found = 1; if (!save_state) { dev_err(&dev->dev, "Out of memory in pci_save_pcie_state\n"); return -ENOMEM; @@ -588,7 +591,8 @@ static int pci_save_pcie_state(struct pci_dev *dev) pci_read_config_word(dev, pos + PCI_EXP_SLTCTL, &cap[i++]); pci_read_config_word(dev, pos + PCI_EXP_RTCTL, &cap[i++]); save_state->cap_nr = PCI_CAP_ID_EXP; - pci_add_saved_cap(dev, save_state); + if (!found) + pci_add_saved_cap(dev, save_state); return 0; } @@ -616,6 +620,7 @@ static int pci_save_pcix_state(struct pci_dev *dev) int pos, i = 0; struct pci_cap_saved_state *save_state; u16 *cap; + int found = 0; pos = pci_find_capability(dev, PCI_CAP_ID_PCIX); if (pos <= 0) @@ -624,6 +629,8 @@ static int pci_save_pcix_state(struct pci_dev *dev) save_state = pci_find_saved_cap(dev, PCI_CAP_ID_PCIX); if (!save_state) save_state = kzalloc(sizeof(*save_state) + sizeof(u16), GFP_KERNEL); + else + found = 1; if (!save_state) { dev_err(&dev->dev, "Out of memory in pci_save_pcie_state\n"); return -ENOMEM; @@ -632,7 +639,8 @@ static int pci_save_pcix_state(struct pci_dev *dev) pci_read_config_word(dev, pos + PCI_X_CMD, &cap[i++]); save_state->cap_nr = PCI_CAP_ID_PCIX; - pci_add_saved_cap(dev, save_state); + if (!found) + pci_add_saved_cap(dev, save_state); return 0; } |