diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-03-12 06:37:53 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-12 06:38:36 +0300 |
commit | ed1f164038b50c5864aa85389f3ffd456f050cca (patch) | |
tree | f0f9d0fd52a798fbe3450d3d85795346411003a6 /drivers/dpll/dpll_core.c | |
parent | a318d3d54c44f9916cd77ad272083d4a4d68899b (diff) | |
parent | 84e95149bd341705f0eca6a7fcb955c548805002 (diff) | |
download | linux-ed1f164038b50c5864aa85389f3ffd456f050cca.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.9 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/dpll/dpll_core.c')
-rw-r--r-- | drivers/dpll/dpll_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c index 6b2a6236f5e3..64eaca80d736 100644 --- a/drivers/dpll/dpll_core.c +++ b/drivers/dpll/dpll_core.c @@ -131,9 +131,9 @@ static int dpll_xa_ref_pin_del(struct xarray *xa_pins, struct dpll_pin *pin, reg = dpll_pin_registration_find(ref, ops, priv); if (WARN_ON(!reg)) return -EINVAL; + list_del(®->list); + kfree(reg); if (refcount_dec_and_test(&ref->refcount)) { - list_del(®->list); - kfree(reg); xa_erase(xa_pins, i); WARN_ON(!list_empty(&ref->registration_list)); kfree(ref); @@ -211,9 +211,9 @@ dpll_xa_ref_dpll_del(struct xarray *xa_dplls, struct dpll_device *dpll, reg = dpll_pin_registration_find(ref, ops, priv); if (WARN_ON(!reg)) return; + list_del(®->list); + kfree(reg); if (refcount_dec_and_test(&ref->refcount)) { - list_del(®->list); - kfree(reg); xa_erase(xa_dplls, i); WARN_ON(!list_empty(&ref->registration_list)); kfree(ref); |