pci: avoid save the same type of cap multiple times
PATCH 3/3 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 <[email protected]>
drivers/pci/pci.c +10 -2
@@ -551,6 +551,7 @@ static int pci_save_pcie_state(struct pcint 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 )
@@ -559,6 +560,8 @@ static int pci_save_pcie_state(struct pc 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 ;
@@ -570,7 +573,8 @@ static int pci_save_pcie_state(struct pcpci_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 ; }
@@ -598,6 +602,7 @@ static int pci_save_pcix_state(struct pcint 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 )
@@ -606,6 +611,8 @@ static int pci_save_pcix_state(struct pc 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 ;
@@ -614,7 +621,8 @@ static int pci_save_pcix_state(struct pcpci_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 ; }