projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
resource_tracker.c
diff --git
a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 502f3350088e547c0fe792171642853277b3549a..9813d34f3e5b78e0b3d4a99e253b710278bc7171 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@
-1241,8
+1241,10
@@
static int add_res_range(struct mlx4_dev *dev, int slave, u64 base, int count,
return 0;
undo:
- for (--i; i >=
base; --i)
+ for (--i; i >=
0; --i) {
rb_erase(&res_arr[i]->node, root);
+ list_del_init(&res_arr[i]->list);
+ }
spin_unlock_irq(mlx4_tlock(dev));