Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82343
b: refs/heads/master
c: 017fc48
h: refs/heads/master
i:
  82341: a534286
  82339: cd390a3
  82335: 60c12ff
v: v3
  • Loading branch information
Shaohua Li authored and Greg Kroah-Hartman committed Feb 1, 2008
1 parent 64f3c89 commit 382d3f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec0a3a27fbb5792980b8c3ce4a93bc2ee93d0b35
refs/heads/master: 017fc480cc8cc0594dc250951d78e814667ae4c2
12 changes: 10 additions & 2 deletions trunk/drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 382d3f7

Please sign in to comment.