summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-01-06 13:16:47 -0800
committerRoland Dreier <rolandd@cisco.com>2010-01-06 13:16:47 -0800
commit0139fd7c2ffd830e571d56f60198306ac24b726e (patch)
tree64526574eeeced6ababb769f72a1ee7a93c091d3 /drivers/net
parentfd4582a3999e03fa9eae315bf14c88fd32d44035 (diff)
parentb4f77264cd1a858ee09da8dba5a2711a649adbf3 (diff)
downloadop-kernel-dev-0139fd7c2ffd830e571d56f60198306ac24b726e.zip
op-kernel-dev-0139fd7c2ffd830e571d56f60198306ac24b726e.tar.gz
Merge branches 'misc' and 'mlx4' into for-next
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/mlx4/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 291a505..3cf56d9 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1174,7 +1174,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
err_port:
- for (port = 1; port <= dev->caps.num_ports; port++)
+ for (--port; port >= 1; --port)
mlx4_cleanup_port_info(&priv->port[port]);
mlx4_cleanup_mcg_table(dev);
OpenPOWER on IntegriCloud