forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

myri10ge: fix potential infinite loop in enable_ecrc

Browse source 
Fix another potential for an infinite loop while looking for the
root port in myri10ge_enable_ecrc().

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Brice Goglin 2008-05-09 02:19:29 +02:00 • committed by Jeff Garzik
commit eca3fd8343
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/myri10ge/myri10ge.c
View file

@ -2657,13 +2657,14 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4; ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4;
if (ext_type != PCI_EXP_TYPE_ROOT_PORT) { if (ext_type != PCI_EXP_TYPE_ROOT_PORT) {
if (myri10ge_ecrc_enable > 1) { if (myri10ge_ecrc_enable > 1) {
struct pci_dev *old_bridge = bridge; struct pci_dev *prev_bridge, *old_bridge = bridge;
/* Walk the hierarchy up to the root port /* Walk the hierarchy up to the root port
* where ECRC has to be enabled */ * where ECRC has to be enabled */
do { do {
prev_bridge = bridge;
bridge = bridge->bus->self; bridge = bridge->bus->self;
if (!bridge) { if (!bridge || prev_bridge == bridge) {
dev_err(dev, dev_err(dev,
"Failed to find root port" "Failed to find root port"
" to force ECRC\n"); " to force ECRC\n");