summaryrefslogtreecommitdiff
path: root/lib/maple_tree.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-05-30 20:41:29 +0100
committerMark Brown <broonie@kernel.org>2023-05-30 20:41:29 +0100
commitb48aa6a3577cccd13ea21392540f6cde437dd04d (patch)
tree77091078bd9c3fd7c38efea83ec71a0719676819 /lib/maple_tree.c
parentf2d4aa7e97eb60f426b92b95da712a6b3c18dc9a (diff)
parent60413129ee2b38a80347489270af7f6e1c1de4d0 (diff)
ES8316 audio codec fixes on Rock5B
Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>: This patch series handles a few issues related to the ES8316 audio codec, discovered while doing some testing on the Rock 5B board.
Diffstat (limited to 'lib/maple_tree.c')
-rw-r--r--lib/maple_tree.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 110a36479dce..8ebc43d4cc8c 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5317,15 +5317,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
mt = mte_node_type(mas->node);
pivots = ma_pivots(mas_mn(mas), mt);
- if (offset)
- mas->min = pivots[offset - 1] + 1;
-
- if (offset < mt_pivots[mt])
- mas->max = pivots[offset];
-
- if (mas->index < mas->min)
- mas->index = mas->min;
-
+ min = mas_safe_min(mas, pivots, offset);
+ if (mas->index < min)
+ mas->index = min;
mas->last = mas->index + size - 1;
return 0;
}