[patch 2/3] pci: correctly initialize a structure

Shaohua Li
2007-12-18T02:02:41Z

save_state->cap_nr should be correctly set, otherwise we can't find the
saved cap at resume.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>

Index: linux/drivers/pci/pci.c
===================================================================
--- linux.orig/drivers/pci/pci.c 2007-12-18 09:35:52.000000000 +0800
+++ linux/drivers/pci/pci.c 2007-12-18 09:36:40.000000000 +0800
@@ -569,6 +569,7 @@ static int pci_save_pcie_state(struct pc
pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &cap[i++]);
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);
return 0;
}
@@ -612,6 +613,7 @@ static int pci_save_pcix_state(struct pc
cap = (u16 *)&save_state->data[0];

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);
return 0;
}