From 77761410ccd409e964e4afef84f83a788470f88c Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Thu, 7 Jun 2007 11:51:58 -0700 Subject: [PATCH] --- yaml --- r: 57590 b: refs/heads/master c: b581401ed0cc83a4483ed39c00a14a60bacecc3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/intf.c | 3 --- trunk/drivers/net/mlx4/main.c | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1e1e486ee54c..9bb24cebfefd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09360d5408cb641abff0f32a172a3332f02e8e88 +refs/heads/master: b581401ed0cc83a4483ed39c00a14a60bacecc3a diff --git a/trunk/drivers/net/mlx4/intf.c b/trunk/drivers/net/mlx4/intf.c index 65854f9e9c76..9ae951bf6aa6 100644 --- a/trunk/drivers/net/mlx4/intf.c +++ b/trunk/drivers/net/mlx4/intf.c @@ -135,9 +135,6 @@ int mlx4_register_device(struct mlx4_dev *dev) struct mlx4_priv *priv = mlx4_priv(dev); struct mlx4_interface *intf; - INIT_LIST_HEAD(&priv->ctx_list); - spin_lock_init(&priv->ctx_lock); - mutex_lock(&intf_mutex); list_add_tail(&priv->dev_list, &dev_list); diff --git a/trunk/drivers/net/mlx4/main.c b/trunk/drivers/net/mlx4/main.c index 20b8c0d3ced4..d4172937025b 100644 --- a/trunk/drivers/net/mlx4/main.c +++ b/trunk/drivers/net/mlx4/main.c @@ -787,6 +787,8 @@ static int __devinit mlx4_init_one(struct pci_dev *pdev, dev = &priv->dev; dev->pdev = pdev; + INIT_LIST_HEAD(&priv->ctx_list); + spin_lock_init(&priv->ctx_lock); /* * Now reset the HCA before we touch the PCI capabilities or