---

yaml --- r: 279010 b: refs/heads/master c: 996b054 h: refs/heads/master v: v3
git-mirror · Dec 19, 2011 · b497c79 · b497c79
1 parent 8d8f30f
commit b497c79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e03567a2c2542e142d5ab6c8bcbf6373a241afe
+refs/heads/master: 996b0541e73a3321947dbc8894a078b8e82e8691
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/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;
 }