summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2007-10-13 14:10:50 -0700
committerRoland Dreier <rolandd@cisco.com>2007-10-13 14:10:50 -0700
commitb027cacdabc3ffe2d2b97a55375203add64a5d29 (patch)
tree37787d8ee8d5192213bff8b8916499591e25058b /drivers/net
parente86908614f2c7fec401827e5cefd7a6ea9407f85 (diff)
downloadtalos-op-linux-b027cacdabc3ffe2d2b97a55375203add64a5d29.tar.gz
talos-op-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')
-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 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)
OpenPOWER on IntegriCloud