Message ID | 20221028050706.48086-2-aaron.ma@canonical.com |
---|---|
State | New |
Headers | show |
Series | Fix ath11k deadlock on WCN6855 | expand |
On Fri, Oct 28, 2022 at 01:07:06PM +0800, Aaron Ma wrote: > From: Wen Gong <quic_wgong@quicinc.com> > > BugLink: https://bugs.launchpad.net/bugs/1995041 Applied to Unstable.
diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c index 7ee3ff69dfc8..6fae4e61ede7 100644 --- a/drivers/net/wireless/ath/ath11k/reg.c +++ b/drivers/net/wireless/ath/ath11k/reg.c @@ -287,11 +287,7 @@ int ath11k_regd_update(struct ath11k *ar) goto err; } - rtnl_lock(); - wiphy_lock(ar->hw->wiphy); - ret = regulatory_set_wiphy_regd_sync(ar->hw->wiphy, regd_copy); - wiphy_unlock(ar->hw->wiphy); - rtnl_unlock(); + ret = regulatory_set_wiphy_regd(ar->hw->wiphy, regd_copy); kfree(regd_copy);