From shaohua.li@intel.com Mon Dec 17 18:02:37 2007 From: Shaohua Li Date: Tue, 18 Dec 2007 09:56:56 +0800 Subject: PCI: correctly initialize a structure for pcie_save_pcix_state() To: lkml Cc: Andrew Morton , Greg KH Message-ID: <1197943016.17023.17.camel@sli10-desk.sh.intel.com> save_state->cap_nr should be correctly set, otherwise we can't find the saved cap at resume. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pci.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -587,6 +587,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; } @@ -630,6 +631,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; }