Merge tag 'kvm-arm-fixes-for-v4.8-round2' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / drivers / hwspinlock / hwspinlock_core.c

diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c
index d50c701..4074441 100644 (file)
--- a/drivers/hwspinlock/hwspinlock_core.c
+++ b/drivers/hwspinlock/hwspinlock_core.c
@@ -313,7 +313,7 @@ int of_hwspin_lock_get_id(struct device_node *np, int index)
                hwlock = radix_tree_deref_slot(slot);
                if (unlikely(!hwlock))
                        continue;
-               if (radix_tree_is_indirect_ptr(hwlock)) {
+               if (radix_tree_deref_retry(hwlock)) {
                        slot = radix_tree_iter_retry(&iter);
                        continue;
                }