diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-01-06 16:16:47 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-01-06 16:16:47 -0500 |
| commit | 0139fd7c2ffd830e571d56f60198306ac24b726e (patch) | |
| tree | 64526574eeeced6ababb769f72a1ee7a93c091d3 /drivers/net | |
| parent | fd4582a3999e03fa9eae315bf14c88fd32d44035 (diff) | |
| parent | b4f77264cd1a858ee09da8dba5a2711a649adbf3 (diff) | |
Merge branches 'misc' and 'mlx4' into for-next
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 291a505fd4fc..3cf56d90d859 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) | |||
| 1174 | return 0; | 1174 | return 0; |
| 1175 | 1175 | ||
| 1176 | err_port: | 1176 | err_port: |
| 1177 | for (port = 1; port <= dev->caps.num_ports; port++) | 1177 | for (--port; port >= 1; --port) |
| 1178 | mlx4_cleanup_port_info(&priv->port[port]); | 1178 | mlx4_cleanup_port_info(&priv->port[port]); |
| 1179 | 1179 | ||
| 1180 | mlx4_cleanup_mcg_table(dev); | 1180 | mlx4_cleanup_mcg_table(dev); |