diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 21:16:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 21:16:49 -0400 |
| commit | d773b33972a663cfaf066e966f87922a74088a1e (patch) | |
| tree | c19f978f2c9a1be0d7a416eabe217f627392e383 /drivers/net | |
| parent | ac3f5753ea37d55c85aaf96211c13038fcc69aef (diff) | |
| parent | b027cacdabc3ffe2d2b97a55375203add64a5d29 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index e029b8afbd37..89b3f0b7cdc0 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, | |||
| 884 | ++mlx4_version_printed; | 884 | ++mlx4_version_printed; |
| 885 | } | 885 | } |
| 886 | 886 | ||
| 887 | return mlx4_init_one(pdev, id); | 887 | return __mlx4_init_one(pdev, id); |
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | static void mlx4_remove_one(struct pci_dev *pdev) | 890 | static void mlx4_remove_one(struct pci_dev *pdev) |