aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 18:16:49 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 18:16:49 -0700
commitd773b33972a663cfaf066e966f87922a74088a1e (patch)
treec19f978f2c9a1be0d7a416eabe217f627392e383 /drivers/net
parentac3f5753ea37d55c85aaf96211c13038fcc69aef (diff)
parentb027cacdabc3ffe2d2b97a55375203add64a5d29 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: mlx4_core: Fix infinite loop on device initialization
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 e029b8afbd3..89b3f0b7cdc 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -884,7 +884,7 @@ static int __devinit mlx4_init_one(struct pci_dev *pdev,
++mlx4_version_printed;
}
- return mlx4_init_one(pdev, id);
+ return __mlx4_init_one(pdev, id);
}
static void mlx4_remove_one(struct pci_dev *pdev)