summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYevgeny Petrilin <yevgenyp@mellanox.co.il>2011-12-19 04:03:05 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-19 14:57:07 -0500
commit996b0541e73a3321947dbc8894a078b8e82e8691 (patch)
tree651b9d7e9c0f717e7a5519aa4d66bbad5e69e773 /drivers
parent0e03567a2c2542e142d5ab6c8bcbf6373a241afe (diff)
mlx4: not using spin_lock_irq when getting vf by resource.
The function is always called from irq context, changing the call to spin_lock(). Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/resource_tracker.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index bdd61c35d044..b41762db5602 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -339,14 +339,14 @@ int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
if (type == RES_QP)
id &= 0x7fffff;
- spin_lock_irq(mlx4_tlock(dev));
+ spin_lock(mlx4_tlock(dev));
r = find_res(dev, id, type);
if (r) {
*slave = r->owner;
err = 0;
}
- spin_unlock_irq(mlx4_tlock(dev));
+ spin_unlock(mlx4_tlock(dev));
return err;
}