diff options
| author | Roland Dreier <rolandd@cisco.com> | 2007-10-13 23:10:50 +0200 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-10-13 23:10:50 +0200 |
| commit | b027cacdabc3ffe2d2b97a55375203add64a5d29 (patch) | |
| tree | 37787d8ee8d5192213bff8b8916499591e25058b /drivers/net/mlx4 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus... (diff) | |
| download | linux-b027cacdabc3ffe2d2b97a55375203add64a5d29.tar.xz linux-b027cacdabc3ffe2d2b97a55375203add64a5d29.zip | |
mlx4_core: Fix infinite loop on device initialization
Commit 3d73c288 ("mlx4_core: Fix section mismatches") introduced a
stupid bug in device init: when some of mlx4_init_one() was split off
into __mlx4_init_one(), the call from the main mlx4_init_one()
function was back to mlx4_init_one() rather than to __mlx4_init_one(),
which leads to an obvious infinite loop if the function is every
called.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/net/mlx4')
| -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, ++mlx4_version_printed; } - return mlx4_init_one(pdev, id); + return __mlx4_init_one(pdev, id); } static void mlx4_remove_one(struct pci_dev *pdev) |